Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
831f06fe
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,发现更多精彩内容 >>
提交
831f06fe
编写于
12月 27, 2019
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi
- Orange Pi Zero Plus 2 support - sunxi psci, prcm fixes
上级
1058bc5c
421e7a41
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
177 addition
and
7 deletion
+177
-7
arch/arm/cpu/armv7/sunxi/psci.c
arch/arm/cpu/armv7/sunxi/psci.c
+11
-5
arch/arm/dts/Makefile
arch/arm/dts/Makefile
+2
-1
arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts
arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts
+139
-0
arch/arm/include/asm/arch-sunxi/prcm.h
arch/arm/include/asm/arch-sunxi/prcm.h
+1
-1
board/sunxi/MAINTAINERS
board/sunxi/MAINTAINERS
+5
-0
configs/orangepi_zero_plus2_h3_defconfig
configs/orangepi_zero_plus2_h3_defconfig
+19
-0
未找到文件。
arch/arm/cpu/armv7/sunxi/psci.c
浏览文件 @
831f06fe
...
...
@@ -75,7 +75,7 @@ static void __secure __mdelay(u32 ms)
isb
();
}
static
void
__secure
clamp_release
(
u32
__maybe_unused
*
clamp
)
static
void
__secure
clamp_release
(
void
__maybe_unused
*
clamp
)
{
#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
defined(CONFIG_MACH_SUN8I_H3) || \
...
...
@@ -90,7 +90,7 @@ static void __secure clamp_release(u32 __maybe_unused *clamp)
#endif
}
static
void
__secure
clamp_set
(
u32
__maybe_unused
*
clamp
)
static
void
__secure
clamp_set
(
void
__maybe_unused
*
clamp
)
{
#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
defined(CONFIG_MACH_SUN8I_H3) || \
...
...
@@ -99,22 +99,28 @@ static void __secure clamp_set(u32 __maybe_unused *clamp)
#endif
}
static
void
__secure
sunxi_power_switch
(
u32
*
clamp
,
u32
*
pwroff
,
bool
on
,
static
void
__secure
sunxi_power_switch
(
void
*
clamp
,
void
*
pwroff_ptr
,
bool
on
,
int
cpu
)
{
u32
pwroff
;
memcpy
(
&
pwroff
,
pwroff_ptr
,
sizeof
(
u32
));
if
(
on
)
{
/* Release power clamp */
clamp_release
(
clamp
);
/* Clear power gating */
clrbits_le32
(
pwroff
,
BIT
(
cpu
));
clrbits_le32
(
&
pwroff
,
BIT
(
cpu
));
}
else
{
/* Set power gating */
setbits_le32
(
pwroff
,
BIT
(
cpu
));
setbits_le32
(
&
pwroff
,
BIT
(
cpu
));
/* Activate power clamp */
clamp_set
(
clamp
);
}
memcpy
(
pwroff_ptr
,
&
pwroff
,
sizeof
(
u32
));
}
#ifdef CONFIG_MACH_SUN8I_R40
...
...
arch/arm/dts/Makefile
浏览文件 @
831f06fe
...
...
@@ -522,7 +522,8 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
sun8i-h3-orangepi-pc.dtb
\
sun8i-h3-orangepi-pc-plus.dtb
\
sun8i-h3-orangepi-plus.dtb
\
sun8i-h3-orangepi-plus2e.dtb
sun8i-h3-orangepi-plus2e.dtb
\
sun8i-h3-orangepi-zero-plus2.dtb
dtb-$(CONFIG_MACH_SUN8I_R40)
+=
\
sun8i-r40-bananapi-m2-ultra.dtb
\
sun8i-v40-bananapi-m2-berry.dtb
...
...
arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts
0 → 100644
浏览文件 @
831f06fe
/*
*
Copyright
(
C
)
2017
Jagan
Teki
<
jteki
@
openedev
.
com
>
*
Copyright
(
C
)
2018
Diego
Rondini
<
diego
.
rondini
@
kynetics
.
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-h3.dtsi"
#
include
<
dt
-
bindings
/
gpio
/
gpio
.
h
>
/
{
model
=
"OrangePi Zero Plus2 H3"
;
compatible
=
"xunlong,orangepi-zero-plus2-h3"
,
"allwinner,sun8i-h3"
;
aliases
{
serial0
=
&
uart0
;
};
chosen
{
stdout
-
path
=
"serial0:115200n8"
;
};
connector
{
compatible
=
"hdmi-connector"
;
type
=
"a"
;
port
{
hdmi_con_in
:
endpoint
{
remote
-
endpoint
=
<&
hdmi_out_con
>;
};
};
};
reg_vcc3v3
:
vcc3v3
{
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"vcc3v3"
;
regulator
-
min
-
microvolt
=
<
3300000
>;
regulator
-
max
-
microvolt
=
<
3300000
>;
};
wifi_pwrseq
:
wifi_pwrseq
{
compatible
=
"mmc-pwrseq-simple"
;
reset
-
gpios
=
<&
pio
0
9
GPIO_ACTIVE_LOW
>;
/*
PA9
*/
post
-
power
-
on
-
delay
-
ms
=
<
200
>;
};
};
&
de
{
status
=
"okay"
;
};
&
hdmi
{
status
=
"okay"
;
};
&
hdmi_out
{
hdmi_out_con
:
endpoint
{
remote
-
endpoint
=
<&
hdmi_con_in
>;
};
};
&
mmc0
{
vmmc
-
supply
=
<&
reg_vcc3v3
>;
bus
-
width
=
<
4
>;
cd
-
gpios
=
<&
pio
5
6
GPIO_ACTIVE_LOW
>;
status
=
"okay"
;
};
&
mmc1
{
vmmc
-
supply
=
<&
reg_vcc3v3
>;
vqmmc
-
supply
=
<&
reg_vcc3v3
>;
mmc
-
pwrseq
=
<&
wifi_pwrseq
>;
bus
-
width
=
<
4
>;
non
-
removable
;
status
=
"okay"
;
brcmf
:
wifi
@
1
{
reg
=
<
1
>;
compatible
=
"brcm,bcm4329-fmac"
;
interrupt
-
parent
=
<&
r_pio
>;
interrupts
=
<
0
7
IRQ_TYPE_LEVEL_LOW
>;
/*
PL7
*/
interrupt
-
names
=
"host-wake"
;
};
};
&
mmc2
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
mmc2_8bit_pins
>;
vmmc
-
supply
=
<&
reg_vcc3v3
>;
bus
-
width
=
<
8
>;
non
-
removable
;
cap
-
mmc
-
hw
-
reset
;
status
=
"okay"
;
};
&
uart0
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
uart0_pins_a
>;
status
=
"okay"
;
};
arch/arm/include/asm/arch-sunxi/prcm.h
浏览文件 @
831f06fe
...
...
@@ -202,7 +202,7 @@
#ifndef __ASSEMBLY__
#include <linux/compiler.h>
struct
__packed
sunxi_prcm_reg
{
struct
sunxi_prcm_reg
{
u32
cpus_cfg
;
/* 0x000 */
u8
res0
[
0x8
];
/* 0x004 */
u32
apb0_ratio
;
/* 0x00c */
...
...
board/sunxi/MAINTAINERS
浏览文件 @
831f06fe
...
...
@@ -405,6 +405,11 @@ M: Jagan Teki <jagan@amarulasolutions.com>
S: Maintained
F: configs/orangepi_zero_plus2_defconfig
ORANGEPI ZERO PLUS 2 H3 BOARD
M: Diego Rondini <diego.rondini@kynetics.com>
S: Maintained
F: configs/orangepi_zero_plus2_h3_defconfig
ORANGEPI PC 2 BOARD
M: Andre Przywara <andre.przywara@arm.com>
S: Maintained
...
...
configs/orangepi_zero_plus2_h3_defconfig
0 → 100644
浏览文件 @
831f06fe
CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y
CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=672
# CONFIG_DRAM_ODT_EN is not set
CONFIG_MMC0_CD_PIN="PH13"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-zero-plus2"
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录