Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
8d24176a
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8d24176a
编写于
7月 02, 2016
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
http://git.denx.de/u-boot-sunxi
上级
68f7289b
d2a6af05
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
396 addition
and
2 deletion
+396
-2
arch/arm/dts/Makefile
arch/arm/dts/Makefile
+2
-1
arch/arm/dts/sun8i-r16-parrot.dts
arch/arm/dts/sun8i-r16-parrot.dts
+348
-0
arch/arm/include/asm/arch-sunxi/spl.h
arch/arm/include/asm/arch-sunxi/spl.h
+2
-0
board/sunxi/MAINTAINERS
board/sunxi/MAINTAINERS
+5
-0
board/sunxi/board.c
board/sunxi/board.c
+1
-1
configs/parrot_r16_defconfig
configs/parrot_r16_defconfig
+38
-0
未找到文件。
arch/arm/dts/Makefile
浏览文件 @
8d24176a
...
...
@@ -234,7 +234,8 @@ dtb-$(CONFIG_MACH_SUN8I_A23) += \
dtb-$(CONFIG_MACH_SUN8I_A33)
+=
\
sun8i-a33-ga10h-v1.1.dtb
\
sun8i-a33-q8-tablet.dtb
\
sun8i-a33-sinlinx-sina33.dtb
sun8i-a33-sinlinx-sina33.dtb
\
sun8i-r16-parrot.dtb
dtb-$(CONFIG_MACH_SUN8I_A83T)
+=
\
sun8i-a83t-allwinner-h8homlet-v2.dtb
\
sun8i-a83t-cubietruck-plus.dtb
\
...
...
arch/arm/dts/sun8i-r16-parrot.dts
0 → 100644
浏览文件 @
8d24176a
/*
*
Copyright
2016
Quentin
Schulz
*
*
Quentin
Schulz
<
quentin
.
schulz
@
free
-
electrons
.
com
>
*
*
This
file
is
dual
-
licensed
:
you
can
use
it
either
under
the
terms
*
of
the
GPL
or
the
X11
license
,
at
your
option
.
Note
that
this
dual
*
licensing
only
applies
to
this
file
,
and
not
this
project
as
a
*
whole
.
*
*
a
)
This
file
is
free
software
;
you
can
redistribute
it
and
/
or
*
modify
it
under
the
terms
of
the
GNU
General
Public
License
as
*
published
by
the
Free
Software
Foundation
;
either
version
2
of
the
*
License
,
or
(
at
your
option
)
any
later
version
.
*
*
This
file
is
distributed
in
the
hope
that
it
will
be
useful
,
*
but
WITHOUT
ANY
WARRANTY
;
without
even
the
implied
warranty
of
*
MERCHANTABILITY
or
FITNESS
FOR
A
PARTICULAR
PURPOSE
.
See
the
*
GNU
General
Public
License
for
more
details
.
*
*
Or
,
alternatively
,
*
*
b
)
Permission
is
hereby
granted
,
free
of
charge
,
to
any
person
*
obtaining
a
copy
of
this
software
and
associated
documentation
*
files
(
the
"Software"
),
to
deal
in
the
Software
without
*
restriction
,
including
without
limitation
the
rights
to
use
,
*
copy
,
modify
,
merge
,
publish
,
distribute
,
sublicense
,
and
/
or
*
sell
copies
of
the
Software
,
and
to
permit
persons
to
whom
the
*
Software
is
furnished
to
do
so
,
subject
to
the
following
*
conditions
:
*
*
The
above
copyright
notice
and
this
permission
notice
shall
be
*
included
in
all
copies
or
substantial
portions
of
the
Software
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
,
WITHOUT
WARRANTY
OF
ANY
KIND
,
*
EXPRESS
OR
IMPLIED
,
INCLUDING
BUT
NOT
LIMITED
TO
THE
WARRANTIES
*
OF
MERCHANTABILITY
,
FITNESS
FOR
A
PARTICULAR
PURPOSE
AND
*
NONINFRINGEMENT
.
IN
NO
EVENT
SHALL
THE
AUTHORS
OR
COPYRIGHT
*
HOLDERS
BE
LIABLE
FOR
ANY
CLAIM
,
DAMAGES
OR
OTHER
LIABILITY
,
*
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
TORT
OR
OTHERWISE
,
ARISING
*
FROM
,
OUT
OF
OR
IN
CONNECTION
WITH
THE
SOFTWARE
OR
THE
USE
OR
*
OTHER
DEALINGS
IN
THE
SOFTWARE
.
*/
/
dts
-
v1
/;
#
include
"sun8i-a33.dtsi"
#
include
"sunxi-common-regulators.dtsi"
#
include
<
dt
-
bindings
/
gpio
/
gpio
.
h
>
#
include
<
dt
-
bindings
/
input
/
input
.
h
>
/
{
model
=
"Allwinner R16 EVB (Parrot)"
;
compatible
=
"allwinner,parrot"
,
"allwinner,sun8i-a33"
;
aliases
{
serial0
=
&
uart0
;
};
chosen
{
stdout
-
path
=
"serial0:115200n8"
;
};
leds
{
compatible
=
"gpio-leds"
;
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
led_pins_parrot
>;
led1
{
label
=
"parrot:led1:usr"
;
gpio
=
<&
pio
4
17
GPIO_ACTIVE_HIGH
>;
/*
PE17
*/
};
led2
{
label
=
"parrot:led2:usr"
;
gpio
=
<&
pio
4
16
GPIO_ACTIVE_HIGH
>;
/*
PE16
*/
};
};
wifi_pwrseq
:
wifi_pwrseq
{
compatible
=
"mmc-pwrseq-simple"
;
reset
-
gpios
=
<&
r_pio
0
6
GPIO_ACTIVE_LOW
>;
/*
PL06
*/
};
};
&
ehci0
{
status
=
"okay"
;
};
&
i2c1
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
i2c1_pins_a
>;
status
=
"okay"
;
/*
FIXME
:
An
as
-
yet
-
unknown
accelerometer
is
connected
to
this
i2c
bus
.
*/
};
&
lradc
{
vref
-
supply
=
<&
reg_aldo3
>;
status
=
"okay"
;
button
@
0
{
label
=
"V+"
;
linux
,
code
=
<
KEY_VOLUMEUP
>;
channel
=
<
0
>;
voltage
=
<
190000
>;
};
button
@
1
{
label
=
"V-"
;
linux
,
code
=
<
KEY_VOLUMEDOWN
>;
channel
=
<
0
>;
voltage
=
<
390000
>;
};
};
&
mmc0
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
mmc0_pins_a
>,
<&
mmc0_cd_pin_parrot
>;
vmmc
-
supply
=
<&
reg_dcdc1
>;
cd
-
gpios
=
<&
pio
3
14
GPIO_ACTIVE_LOW
>;
/*
PD14
*/
bus
-
width
=
<
4
>;
status
=
"okay"
;
};
&
mmc1
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
mmc1_pins_a
>,
<&
wifi_reset_pin_parrot
>;
vmmc
-
supply
=
<&
reg_aldo1
>;
mmc
-
pwrseq
=
<&
wifi_pwrseq
>;
bus
-
width
=
<
4
>;
non
-
removable
;
status
=
"okay"
;
};
&
mmc2
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
mmc2_8bit_pins
>;
vmmc
-
supply
=
<&
reg_dcdc1
>;
bus
-
width
=
<
8
>;
non
-
removable
;
cap
-
mmc
-
hw
-
reset
;
status
=
"okay"
;
};
&
mmc2_8bit_pins
{
allwinner
,
drive
=
<
SUN4I_PINCTRL_40_MA
>;
allwinner
,
pull
=
<
SUN4I_PINCTRL_PULL_UP
>;
};
&
ohci0
{
status
=
"okay"
;
};
&
pio
{
mmc0_cd_pin_parrot
:
mmc0_cd_pin
@
0
{
allwinner
,
pins
=
"PD14"
;
allwinner
,
function
=
"gpio_in"
;
allwinner
,
drive
=
<
SUN4I_PINCTRL_10_MA
>;
allwinner
,
pull
=
<
SUN4I_PINCTRL_PULL_UP
>;
};
led_pins_parrot
:
led_pins
@
0
{
allwinner
,
pins
=
"PE16"
,
"PE17"
;
allwinner
,
function
=
"gpio_out"
;
allwinner
,
drive
=
<
SUN4I_PINCTRL_10_MA
>;
allwinner
,
pull
=
<
SUN4I_PINCTRL_NO_PULL
>;
};
usb0_id_det
:
usb0_id_detect_pin
@
0
{
allwinner
,
pins
=
"PD10"
;
allwinner
,
function
=
"gpio_in"
;
allwinner
,
drive
=
<
SUN4I_PINCTRL_10_MA
>;
allwinner
,
pull
=
<
SUN4I_PINCTRL_PULL_UP
>;
};
usb1_vbus_pin_parrot
:
usb1_vbus_pin
@
0
{
allwinner
,
pins
=
"PD12"
;
allwinner
,
function
=
"gpio_out"
;
allwinner
,
drive
=
<
SUN4I_PINCTRL_10_MA
>;
allwinner
,
pull
=
<
SUN4I_PINCTRL_NO_PULL
>;
};
};
&
r_pio
{
wifi_reset_pin_parrot
:
wifi_reset_pin
@
0
{
allwinner
,
pins
=
"PL6"
;
allwinner
,
function
=
"gpio_out"
;
allwinner
,
drive
=
<
SUN4I_PINCTRL_10_MA
>;
allwinner
,
pull
=
<
SUN4I_PINCTRL_NO_PULL
>;
};
};
&
r_rsb
{
status
=
"okay"
;
axp22x
:
pmic
@
3
a3
{
compatible
=
"x-powers,axp223"
;
reg
=
<
0x3a3
>;
interrupt
-
parent
=
<&
nmi_intc
>;
interrupts
=
<
0
IRQ_TYPE_LEVEL_LOW
>;
drivevbus
-
supply
=
<&
reg_vcc5v0
>;
x
-
powers
,
drive
-
vbus
-
en
;
};
};
#
include
"axp22x.dtsi"
&
reg_aldo1
{
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
3000000
>;
regulator
-
max
-
microvolt
=
<
3000000
>;
regulator
-
name
=
"vcc-io"
;
};
&
reg_aldo2
{
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
2350000
>;
regulator
-
max
-
microvolt
=
<
2650000
>;
regulator
-
name
=
"vdd-dll"
;
};
&
reg_aldo3
{
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
2700000
>;
regulator
-
max
-
microvolt
=
<
3300000
>;
regulator
-
name
=
"vcc-pll-avcc"
;
};
&
reg_dc5ldo
{
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
900000
>;
regulator
-
max
-
microvolt
=
<
1400000
>;
regulator
-
name
=
"vdd-cpus"
;
};
&
reg_dcdc1
{
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
3000000
>;
regulator
-
max
-
microvolt
=
<
3000000
>;
regulator
-
name
=
"vcc-3v0"
;
};
&
reg_dcdc2
{
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
900000
>;
regulator
-
max
-
microvolt
=
<
1400000
>;
regulator
-
name
=
"vdd-sys"
;
};
&
reg_dcdc3
{
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
900000
>;
regulator
-
max
-
microvolt
=
<
1400000
>;
regulator
-
name
=
"vdd-cpu"
;
};
&
reg_dcdc5
{
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
1500000
>;
regulator
-
max
-
microvolt
=
<
1500000
>;
regulator
-
name
=
"vcc-dram"
;
};
&
reg_dldo1
{
/*
*
TODO
:
WiFi
chip
needs
dldo1
AND
dldo2
to
be
on
to
be
powered
.
*
Remove
next
line
once
it
is
possible
to
sync
two
regulators
.
*/
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
3300000
>;
regulator
-
max
-
microvolt
=
<
3300000
>;
regulator
-
name
=
"vcc-wifi0"
;
};
&
reg_dldo2
{
/*
*
TODO
:
WiFi
chip
needs
dldo1
AND
dldo2
to
be
on
to
be
powered
.
*
Remove
next
line
once
it
is
possible
to
sync
two
regulators
.
*/
regulator
-
always
-
on
;
regulator
-
min
-
microvolt
=
<
3300000
>;
regulator
-
max
-
microvolt
=
<
3300000
>;
regulator
-
name
=
"vcc-wifi1"
;
};
&
reg_dldo3
{
regulator
-
min
-
microvolt
=
<
3000000
>;
regulator
-
max
-
microvolt
=
<
3000000
>;
regulator
-
name
=
"vcc-3v0-csi"
;
};
&
reg_drivevbus
{
regulator
-
name
=
"usb0-vbus"
;
status
=
"okay"
;
};
&
reg_eldo1
{
regulator
-
min
-
microvolt
=
<
1200000
>;
regulator
-
max
-
microvolt
=
<
1200000
>;
regulator
-
name
=
"vcc-1v2-hsic"
;
};
&
reg_eldo2
{
regulator
-
min
-
microvolt
=
<
3000000
>;
regulator
-
max
-
microvolt
=
<
3000000
>;
regulator
-
name
=
"vcc-dsp"
;
};
&
reg_eldo3
{
regulator
-
min
-
microvolt
=
<
3000000
>;
regulator
-
max
-
microvolt
=
<
3000000
>;
regulator
-
name
=
"eldo3"
;
};
&
reg_usb1_vbus
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
usb1_vbus_pin_parrot
>;
gpio
=
<&
pio
3
12
GPIO_ACTIVE_HIGH
>;
/*
PD12
*/
status
=
"okay"
;
};
&
uart0
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
uart0_pins_b
>;
status
=
"okay"
;
};
&
usb_otg
{
dr_mode
=
"otg"
;
status
=
"okay"
;
};
&
usb_power_supply
{
status
=
"okay"
;
};
&
usbphy
{
status
=
"okay"
;
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
usb0_id_det
>;
usb0_vbus
-
supply
=
<&
reg_drivevbus
>;
usb0_id_det
-
gpios
=
<&
pio
3
10
GPIO_ACTIVE_HIGH
>;
/*
PD10
*/
usb0_vbus_power
-
supply
=
<&
usb_power_supply
>;
usb1_vbus
-
supply
=
<&
reg_usb1_vbus
>;
};
arch/arm/include/asm/arch-sunxi/spl.h
浏览文件 @
8d24176a
...
...
@@ -20,6 +20,8 @@
/* The low 8-bits of the 'boot_media' field in the SPL header */
#define SUNXI_BOOTED_FROM_MMC0 0
#define SUNXI_BOOTED_FROM_NAND 1
#define SUNXI_BOOTED_FROM_MMC2 2
#define SUNXI_BOOTED_FROM_SPI 3
/* boot head definition from sun4i boot code */
...
...
board/sunxi/MAINTAINERS
浏览文件 @
8d24176a
...
...
@@ -202,6 +202,11 @@ M: Siarhei Siamashka <siarhei.siamashka@gmail.com>
S: Maintained
F: configs/MSI_Primo81_defconfig
R16 EVB PARROT BOARD
M: Quentin Schulz <quentin.schulz@free-electrons.com>
S: Maintained
F: configs/parrot_r16_defconfig
SINLINX SINA31s BOARD
M: Chen-Yu Tsai <wens@csie.org>
S: Maintained
...
...
board/sunxi/board.c
浏览文件 @
8d24176a
...
...
@@ -529,7 +529,7 @@ void sunxi_board_init(void)
#endif
printf
(
"DRAM:"
);
ramsize
=
sunxi_dram_init
();
printf
(
" %
lu MiB
\n
"
,
ramsize
>>
20
);
printf
(
" %
d MiB
\n
"
,
(
int
)(
ramsize
>>
20
)
);
if
(
!
ramsize
)
hang
();
...
...
configs/parrot_r16_defconfig
0 → 100644
浏览文件 @
8d24176a
CONFIG_ARM=y
CONFIG_MACH_SUN8I=y
CONFIG_ARCH_SUNXI=y
CONFIG_MACH_SUN8I_A33=y
CONFIG_DEFAULT_DEVICE_TREE="sun8i-r16-parrot"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_MMC=y
CONFIG_MMC0_CD_PIN="PD14"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_MMC2_PINS="PC"
CONFIG_DRAM_CLK=600
CONFIG_DRAM_ZQ=15291
CONFIG_ODT_EN=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB1_VBUS_PIN="PD12"
CONFIG_AXP_GPIO=y
CONFIG_USB0_ID_DET="PD10"
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
CONFIG_G_DNL_VENDOR_NUM=0x1f3a
CONFIG_G_DNL_PRODUCT_NUM=0x1010
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录