Qubot/armbian-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allwinner: Bump u-boot to 2023.01

Browse Source
This commit is contained in:
Gunjan Gupta 2023-06-23 11:07:03 +05:30 committed by Igor
parent ef0598a88e
commit 9525b2d16c
49 changed files with 814 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/bananapim64.conf
View File

@ -5,3 +5,4 @@ BOARD_MAINTAINER="devdotnetorg"
BOOTCONFIG_DEFAULT="sun50iw1p1_config"
BOOTCONFIG="bananapi_m64_defconfig"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="a64_defconfig"

1
config/boards/lime-a64.csc
View File

@ -6,3 +6,4 @@ BOOTCONFIG_DEFAULT="sun50iw1p1_config"
BOOTCONFIG="a64-olinuxino_defconfig"
KERNEL_TARGET="legacy,current,edge"
FULL_DESKTOP="yes"
CRUSTCONFIG="a64_defconfig"

1
config/boards/nanopi-r1s-h5.conf
View File

@ -10,3 +10,4 @@ DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="current,edge"
HAS_VIDEO_OUTPUT="no"
CRUSTCONFIG="h5_defconfig"

1
config/boards/nanopia64.csc
View File

@ -5,3 +5,4 @@ BOARD_MAINTAINER=""
BOOTCONFIG="nanopi_a64_defconfig"
KERNEL_TARGET="legacy,current,edge"
FULL_DESKTOP="yes"
CRUSTCONFIG="a64_defconfig"

1
config/boards/nanopik1plus.conf
View File

@ -5,3 +5,4 @@ BOARD_MAINTAINER=""
BOOTCONFIG="nanopi_k1_plus_defconfig"
DEFAULT_OVERLAYS="analog-codec"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h5_defconfig"

1
config/boards/nanopim1plus2.eos
View File

@ -4,3 +4,4 @@ BOARDFAMILY="sun50iw2"
BOARD_MAINTAINER=""
BOOTCONFIG="nanopi_m1_plus2_defconfig"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h5_defconfig"

1
config/boards/nanopineo2.conf
View File

@ -10,3 +10,4 @@ DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h5_defconfig"

1
config/boards/nanopineo2black.conf
View File

@ -10,3 +10,4 @@ DEFAULT_CONSOLE="serial"
SERIALCON="ttyS1,ttyGS0"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h5_defconfig"

1
config/boards/nanopineocore2.csc
View File

@ -10,3 +10,4 @@ DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h5_defconfig"

1
config/boards/nanopineoplus2.conf
View File

@ -10,3 +10,4 @@ DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h5_defconfig"

1
config/boards/olimex-teres-a64.conf
View File

@ -20,3 +20,4 @@ BOOTCONFIG="teres_i_defconfig"
# NOTE(Krey): Pulseaudio is needed for the audio to work especially in pipewire configuration, I wasn't able to make it work just off of ALSA
PACKAGE_LIST_BOARD="pulseaudio"
CRUSTCONFIG="a64_defconfig"

3
config/boards/orangepi3-lts.csc
View File

@ -7,6 +7,7 @@ KERNEL_TARGET="current,edge"
MODULES="sprdbt_tty sprdwl_ng"
MODULES_BLACKLIST_LEGACY="bcmdhd"
ATFBRANCH="tag:v2.2"
CRUSTCONFIG="h6_defconfig"
function post_family_tweaks_bsp__orangepi3-lts_BSP() {
display_alert "Installing BSP firmware and fixups"
@ -20,4 +21,4 @@ function post_family_tweaks_bsp__orangepi3-lts_BSP() {
fi
return 0
}
}

3
config/boards/orangepi3.csc
View File

@ -6,6 +6,7 @@ BOOTCONFIG="orangepi_3_defconfig"
KERNEL_TARGET="legacy,current,edge"
FULL_DESKTOP="yes"
ATFBRANCH="tag:v2.2"
CRUSTCONFIG="h6_defconfig"
function post_family_tweaks_bsp__orangepi3_BSP() {
display_alert "Installing BSP firmware and fixups"
@ -19,4 +20,4 @@ function post_family_tweaks_bsp__orangepi3_BSP() {
fi
return 0
}
}

3
config/boards/orangepilite2.conf
View File

@ -4,6 +4,7 @@ BOARDFAMILY="sun50iw6"
BOARD_MAINTAINER=""
BOOTCONFIG="orangepi_lite2_defconfig"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h6_defconfig"
function post_family_tweaks_bsp__orangepilite2_BSP() {
display_alert "Installing BSP firmware and fixups"
@ -17,4 +18,4 @@ function post_family_tweaks_bsp__orangepilite2_BSP() {
fi
return 0
}
}

3
config/boards/orangepioneplus.conf
View File

@ -5,6 +5,7 @@ BOARD_MAINTAINER=""
BOOTCONFIG="orangepi_one_plus_defconfig"
KERNEL_TARGET="legacy,current,edge"
ATFBRANCH="tag:v2.2"
CRUSTCONFIG="h6_defconfig"
function post_family_tweaks_bsp__orangepioneplus_BSP() {
display_alert "Installing BSP firmware and fixups"
@ -18,4 +19,4 @@ function post_family_tweaks_bsp__orangepioneplus_BSP() {
fi
return 0
}
}

3
config/boards/orangepipc2.csc
View File

@ -5,6 +5,7 @@ BOARD_MAINTAINER=""
BOOTCONFIG="orangepi_pc2_defconfig"
KERNEL_TARGET="legacy,current,edge"
FULL_DESKTOP="yes"
CRUSTCONFIG="h5_defconfig"
function post_family_tweaks_bsp__orangepipc2_BSP() {
display_alert "Installing BSP firmware and fixups"
@ -18,4 +19,4 @@ function post_family_tweaks_bsp__orangepipc2_BSP() {
fi
return 0
}
}

3
config/boards/orangepiprime.csc
View File

@ -6,6 +6,7 @@ BOOTCONFIG="orangepi_prime_defconfig"
DEFAULT_OVERLAYS="analog-codec"
KERNEL_TARGET="legacy,current,edge"
FULL_DESKTOP="yes"
CRUSTCONFIG="h5_defconfig"
function post_family_tweaks_bsp__orangepiprime_BSP() {
display_alert "Installing BSP firmware and fixups"
@ -19,4 +20,4 @@ function post_family_tweaks_bsp__orangepiprime_BSP() {
fi
return 0
}
}

3
config/boards/orangepiwin.csc
View File

@ -4,6 +4,7 @@ BOARDFAMILY="sun50iw1"
BOARD_MAINTAINER=""
BOOTCONFIG="orangepi_win_defconfig"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="a64_defconfig"
function post_family_tweaks_bsp__orangepiwin_BSP() {
display_alert "Installing BSP firmware and fixups"
@ -17,4 +18,4 @@ function post_family_tweaks_bsp__orangepiwin_BSP() {
fi
return 0
}
}

3
config/boards/orangepizeroplus.conf
View File

@ -10,6 +10,7 @@ SERIALCON="ttyS0,ttyGS0"
DEFAULT_OVERLAYS="usbhost2 usbhost3"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h5_defconfig"
function post_family_tweaks_bsp__orangepizeroplus_BSP() {
display_alert "Installing BSP firmware and fixups"
@ -23,4 +24,4 @@ function post_family_tweaks_bsp__orangepizeroplus_BSP() {
fi
return 0
}
}

3
config/boards/orangepizeroplus2-h5.csc
View File

@ -9,6 +9,7 @@ DEFAULT_OVERLAYS="gpio-regulator-1.3v usbhost2 usbhost3"
HAS_VIDEO_OUTPUT="no"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h5_defconfig"
function post_family_tweaks_bsp__orangepizeroplus2-h5_BSP() {
display_alert "Installing BSP firmware and fixups"
@ -22,4 +23,4 @@ function post_family_tweaks_bsp__orangepizeroplus2-h5_BSP() {
fi
return 0
}
}

1
config/boards/pine64.conf
View File

@ -5,3 +5,4 @@ BOARD_MAINTAINER="joshaspinall PanderMusubi"
BOOTCONFIG="pine64_plus_defconfig"
KERNEL_TARGET="legacy,current,edge"
FULL_DESKTOP="yes"
CRUSTCONFIG="a64_defconfig"

1
config/boards/pine64so.conf
View File

@ -5,3 +5,4 @@ BOARD_MAINTAINER="joshaspinall"
BOOTCONFIG="sopine_baseboard_defconfig"
KERNEL_TARGET="legacy,current,edge"
FULL_DESKTOP="yes"
CRUSTCONFIG="a64_defconfig"

1
config/boards/pinebook-a64.csc
View File

@ -6,3 +6,4 @@ BOOTCONFIG="pinebook_defconfig"
KERNEL_TARGET="legacy,current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
CRUSTCONFIG="a64_defconfig"

1
config/boards/pineh64-b.conf
View File

@ -5,3 +5,4 @@ BOARD_MAINTAINER=""
BOOTCONFIG="pine_h64_defconfig"
KERNEL_TARGET="legacy,current,edge"
BOOT_FDT_FILE="allwinner/sun50i-h6-pine-h64-model-b.dtb"
CRUSTCONFIG="h6_defconfig"

1
config/boards/pineh64.csc
View File

@ -4,3 +4,4 @@ BOARDFAMILY="sun50iw6"
BOARD_MAINTAINER=""
BOOTCONFIG="pine_h64_defconfig"
KERNEL_TARGET="legacy,current,edge"
CRUSTCONFIG="h6_defconfig"

1
config/boards/tritium-h5.conf
View File

@ -8,3 +8,4 @@ DEFAULT_OVERLAYS="analog-codec"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="legacy,current,edge"
FULL_DESKTOP="yes"
CRUSTCONFIG="h5_defconfig"

4
config/sources/families/include/sunxi64_common.inc
View File

@ -11,9 +11,9 @@ declare -g ARCH=arm64
declare -g ATF_TARGET_MAP="PLAT=$ATF_PLAT DEBUG=1 bl31;;build/$ATF_PLAT/debug/bl31.bin"
declare -g BOOTDELAY=1
declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"u-boot-sunxi"}"
declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2022.10"}"
declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2023.01"}"
declare -g BOOTENV_FILE='sunxi.txt'
UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-;;u-boot-sunxi-with-spl.bin}"
UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-BINMAN_ALLOW_MISSING=1;;u-boot-sunxi-with-spl.bin}"
declare -g BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
declare -g LINUXFAMILY=sunxi64
declare -g CRUST_TARGET_MAP="scp;;build/scp/scp.bin"

2
config/sources/families/include/sunxi_common.inc
View File

@ -10,7 +10,7 @@ enable_extension "sunxi-tools"
declare -g ARCH=armhf
declare -g BOOTDELAY=1
declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"u-boot-sunxi"}"
declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2022.10"}"
declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2023.01"}"
UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-;;u-boot-sunxi-with-spl.bin}"
declare -g BOOTSCRIPT="boot-sunxi.cmd:boot.cmd"
declare -g BOOTENV_FILE='sunxi.txt'

29
patch/crust/add-defconfig-for-h3-h5-h6-a64-platforms.patch Normal file
View File

@ -0,0 +1,29 @@
diff --git a/configs/a64_defconfig b/configs/a64_defconfig
new file mode 100644
index 0000000..3e6240c
--- /dev/null
+++ b/configs/a64_defconfig
@@ -0,0 +1 @@
+CONFIG_PLATFORM_A64=y
diff --git a/configs/h3_defconfig b/configs/h3_defconfig
new file mode 100644
index 0000000..540c425
--- /dev/null
+++ b/configs/h3_defconfig
@@ -0,0 +1 @@
+CONFIG_PLATFORM_H3=y
diff --git a/configs/h5_defconfig b/configs/h5_defconfig
new file mode 100644
index 0000000..c641b90
--- /dev/null
+++ b/configs/h5_defconfig
@@ -0,0 +1,2 @@
+CONFIG_PLATFORM_A64=y
+CONFIG_SOC_H5=y
diff --git a/configs/h6_defconfig b/configs/h6_defconfig
new file mode 100644
index 0000000..857e16d
--- /dev/null
+++ b/configs/h6_defconfig
@@ -0,0 +1 @@
+CONFIG_PLATFORM_H6=y

80
patch/u-boot/u-boot-sunxi-crust/h3-scp.patch
View File

@ -1,4 +1,4 @@
From f12a3108458ff425dc6991ba83309f33014ccf2d Mon Sep 17 00:00:00 2001
From 470356d816b305448b14eb6f09fcaccc248ca598 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 10:40:45 -0500
Subject: [PATCH 01/11] Kconfig: Remove an impossible condition
@ -12,11 +12,11 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Kconfig b/Kconfig
index c8c22555a9..f0db8d8570 100644
index 0cdc9658f7..e367a28c69 100644
--- a/Kconfig
+++ b/Kconfig
@@ -459,7 +459,7 @@ config BUILD_TARGET
default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
default "u-boot-with-spl.kwb" if ARCH_MVEBU && SPL
default "u-boot-elf.srec" if RCAR_GEN3
default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
- ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
@ -27,7 +27,8 @@ index c8c22555a9..f0db8d8570 100644
--
2.34.1
From b1ff292fb030864ad64b73cf2308d1844a0f5374 Mon Sep 17 00:00:00 2001
From 0d2371ac7e031ccb866916e1a053a667b40fee8e Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 10:43:56 -0500
Subject: [PATCH 02/11] binman: Prevent entries in a section from overlapping
@ -48,10 +49,10 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 63ec5cea3b..1566e598db 100644
index 1be31a05e0..33d1dfeb7b 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -475,7 +475,9 @@ class Entry(object):
@@ -483,7 +483,9 @@ class Entry(object):
if self.offset_unset:
self.Raise('No offset set with offset-unset: should another '
'entry provide this correct offset?')
@ -65,7 +66,8 @@ index 63ec5cea3b..1566e598db 100644
--
2.34.1
From fd4854be1f1eaeb460f128a6f67d82c5a585aa88 Mon Sep 17 00:00:00 2001
From 7ed6ed1bc3dd2a76ffe8cc19c8fec4c7c01bfaa6 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 17 Apr 2021 13:33:54 -0500
Subject: [PATCH 03/11] sunxi: binman: Enable SPL FIT loading for 32-bit SoCs
@ -108,10 +110,10 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
3 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d726bbf4b3..cbc8572217 100644
index ff46730bfb..befb8edd20 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1192,6 +1192,7 @@ config ARCH_SUNXI
@@ -1137,6 +1137,7 @@ config ARCH_SUNXI
imply SPL_GPIO
imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBGENERIC_SUPPORT
@ -120,7 +122,7 @@ index d726bbf4b3..cbc8572217 100644
imply SPL_POWER
imply SPL_SERIAL
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index 0f573e6d7a..e75c690491 100644
index 2028d5b6a9..cfe8a6cf3a 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -1,13 +1,19 @@
@ -172,8 +174,8 @@ index 0f573e6d7a..e75c690491 100644
- arch = "arm64";
+ arch = ARCH;
compression = "none";
load = <CONFIG_SYS_TEXT_BASE>;
+ entry = <CONFIG_SYS_TEXT_BASE>;
load = <CONFIG_TEXT_BASE>;
+ entry = <CONFIG_TEXT_BASE>;
u-boot-nodtb {
};
@ -226,10 +228,10 @@ index 0f573e6d7a..e75c690491 100644
#endif
};
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 70d97815f0..5707632dd6 100644
index d774c930a8..77e5b0e563 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -75,7 +75,9 @@ config SPL_SIZE_LIMIT_PROVIDE_STACK
@@ -76,7 +76,9 @@ config SPL_SIZE_LIMIT_PROVIDE_STACK
config SPL_MAX_SIZE
hex "Maximum size of the SPL image, excluding BSS"
@ -239,16 +241,16 @@ index 70d97815f0..5707632dd6 100644
default 0x1b000 if AM33XX && !TI_SECURE_DEVICE
default 0x10000 if ARCH_MX6 && !MX6_OCRAM_256KB
default 0x7fa0 if SUNXI_SRAM_ADDRESS = 0x10000
@@ -95,7 +97,7 @@ config SPL_PAD_TO
@@ -97,7 +99,7 @@ config SPL_PAD_TO
default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB
default 0x11000 if ARCH_MX7 || (ARCH_MX6 && !MX6_OCRAM_256KB)
default 0x10000 if ARCH_KEYSTONE
- default 0x8000 if ARCH_SUNXI && !MACH_SUN50I_H616
+ default 0x0 if ARCH_SUNXI
default 0x0 if ARCH_MTMIPS
default TPL_MAX_SIZE if TPL_MAX_SIZE > SPL_MAX_SIZE
default SPL_MAX_SIZE
help
@@ -567,8 +569,7 @@ config SPL_MD5
@@ -575,8 +577,7 @@ config SPL_MD5
config SPL_FIT_IMAGE_TINY
bool "Remove functionality from SPL FIT loading to reduce size"
depends on SPL_FIT
@ -261,7 +263,8 @@ index 70d97815f0..5707632dd6 100644
--
2.34.1
From 54553ef913d8da8a46d07827073cc049077534b5 Mon Sep 17 00:00:00 2001
From e0f104e255525c54e22cfdd58415b6041d6096d8 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 22:00:22 -0500
Subject: [PATCH 04/11] sunxi: psci: Avoid hanging when CPU 0 is hot-unplugged
@ -317,7 +320,8 @@ index e1d3638b5c..738ea8f281 100644
--
2.34.1
From 431f8e3bbb0e844b2b58794838697c703041ed88 Mon Sep 17 00:00:00 2001
From a7223def28f3a9d25f19f8d9f34824c88f671bfb Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 17:12:57 -0500
Subject: [PATCH 05/11] sunxi: psci: Add support for H3 CPU 0 hotplug
@ -346,10 +350,10 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
4 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 50077027ba..715af7de94 100644
index 9a8a7c4681..ab0b18d881 100644
--- a/Makefile
+++ b/Makefile
@@ -1006,6 +1006,23 @@ INPUTS-y += u-boot.img
@@ -1013,6 +1013,23 @@ INPUTS-y += u-boot.img
endif
endif
@ -446,7 +450,7 @@ index 738ea8f281..e6bfd193e4 100644
setbits_le32(&cpucfg->dbg_ctrl1, BIT(cpu));
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index e75c690491..dc00d2d0f9 100644
index cfe8a6cf3a..9cb9e85453 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -6,7 +6,11 @@
@ -511,7 +515,8 @@ index 608a055892..98e68e068b 100644
--
2.34.1
From cc1929f388235c3860842cddfee4076ffa91ac0f Mon Sep 17 00:00:00 2001
From 2e62fb5affdeea8364a97a35b1d925673e6ac1f2 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 14:58:27 -0500
Subject: [PATCH 06/11] remoteproc: Add a driver for the Allwinner AR100
@ -676,7 +681,8 @@ index 0000000000..c94f6c752b
--
2.34.1
From 6d37ee46acf3fa726f151a48d68034f8952b0221 Mon Sep 17 00:00:00 2001
From b6372d0bedae59d11e7f2791940f0c1b146918df Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 15:04:16 -0500
Subject: [PATCH 07/11] arm: dts: sunxi: h3: Add nodes for AR100 remoteproc
@ -721,7 +727,8 @@ index eac2349a23..b88dcd4272 100644
--
2.34.1
From 6cc77eccccdc82591a43c95a47602ca3c94940dd Mon Sep 17 00:00:00 2001
From 51dd93e53d3ce8bcfb10f241a9e6911ed3ed692c Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 17 Apr 2021 13:33:54 -0500
Subject: [PATCH 08/11] sunxi: Enable support for SCP firmware on H3
@ -739,7 +746,7 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
3 files changed, 12 insertions(+)
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index dc00d2d0f9..ee4c374b09 100644
index 9cb9e85453..228b43c0c0 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -9,6 +9,7 @@
@ -751,7 +758,7 @@ index dc00d2d0f9..ee4c374b09 100644
#elif defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUN50I_H5)
#define BL31_ADDR 0x00044000
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index ed45ed04f5..980c02a455 100644
index 3079ac0002..1e488a1952 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -19,6 +19,7 @@
@ -762,7 +769,7 @@ index ed45ed04f5..980c02a455 100644
#include <axp_pmic.h>
#include <generic-phy.h>
#include <phy-sun4i-usb.h>
@@ -883,6 +884,13 @@ int board_late_init(void)
@@ -884,6 +885,13 @@ int board_late_init(void)
usb_ether_init();
#endif
@ -793,7 +800,8 @@ index 98e68e068b..506ce35707 100644
--
2.34.1
From 598e27fe78a6879d59ac8cdb29c721736492dad8 Mon Sep 17 00:00:00 2001
From 86585a0f23efa3b16caf44571a64686a7f0b67bc Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 22:43:26 -0500
Subject: [PATCH 09/11] arm: psci: Add definitions for PSCI v1.1
@ -921,7 +929,8 @@ index 903b335704..ea9d1c8355 100644
--
2.34.1
From c8bf2bfc115f5e72c2983595368853eb660b950f Mon Sep 17 00:00:00 2001
From 862da00823c5cbf38b8532c96e0a92768d0b607d Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 23:01:05 -0500
Subject: [PATCH 10/11] sunxi: psci: Delegate PSCI to SCPI
@ -1428,7 +1437,8 @@ index 0000000000..cf85292a8f
--
2.34.1
From be6dbfb89d0b4430f4e565597849baf0c9907550 Mon Sep 17 00:00:00 2001
From 5ea3ebb020321ecb542a353ba1106cca8871f83e Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Wed, 8 Jun 2022 07:55:54 -0500
Subject: [PATCH 11/11] sunxi: Enable SCP/SCPI on A33 as well
@ -1485,10 +1495,10 @@ index cf85292a8f..717c37c124 100644
#define SCPI_RX_CHANNEL 1
diff --git a/arch/arm/dts/sun8i-a23-a33.dtsi b/arch/arm/dts/sun8i-a23-a33.dtsi
index a42fac676b..489bbc0254 100644
index 06809c3a1f..c3d5a0d070 100644
--- a/arch/arm/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/dts/sun8i-a23-a33.dtsi
@@ -137,6 +137,14 @@
@@ -138,6 +138,14 @@
#size-cells = <1>;
ranges;
@ -1503,7 +1513,7 @@ index a42fac676b..489bbc0254 100644
sram_c: sram@1d00000 {
compatible = "mmio-sram";
reg = <0x01d00000 0x80000>;
@@ -846,5 +854,11 @@
@@ -847,5 +855,11 @@
#address-cells = <1>;
#size-cells = <0>;
};
@ -1516,7 +1526,7 @@ index a42fac676b..489bbc0254 100644
};
};
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index ee4c374b09..774cb1ff91 100644
index 228b43c0c0..ed99a74b1a 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -6,11 +6,11 @@

10
patch/u-boot/u-boot-sunxi-crust/sunxi-Enable-remoteproc-on-H3.patch
View File

@ -1,7 +1,7 @@
From 3fe205fc0e4c81cddbd3b7adacf29e0819f3672f Mon Sep 17 00:00:00 2001
From 06afe2e6d71c632dde6aafbac5c194a707805276 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Tue, 12 Oct 2021 20:45:10 +0200
Subject: [PATCH] [DO NOT MERGE] sunxi: Enable remoteproc on H3
Subject: [PATCH] sunxi: Enable remoteproc on H3
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
@ -9,10 +9,10 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 1d4a4fdd0c59..4414b847b7e4 100644
index 41e19ba102..e2fa48c07c 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -295,6 +295,7 @@ config MACH_SUN8I_H3
@@ -286,6 +286,7 @@ config MACH_SUN8I_H3
select CPU_V7_HAS_VIRT
select ARCH_SUPPORT_PSCI
select MACH_SUNXI_H3_H5
@ -21,5 +21,5 @@ index 1d4a4fdd0c59..4414b847b7e4 100644
config MACH_SUN8I_R40
--
2.33.0
2.34.1

12
patch/u-boot/u-boot-sunxi/allwinner-a10-spi-driver.patch
View File

@ -1,4 +1,4 @@
From ea6e665f216de304e239b869e9156a192260e098 Mon Sep 17 00:00:00 2001
From 160249593a3c731d7582ee50f59c877c023425cf Mon Sep 17 00:00:00 2001
From: Stefan Mavrodiev <stefan@olimex.com>
Date: Tue, 6 Feb 2018 15:14:33 +0200
Subject: [PATCH] arm: sunxi: Allwinner A10 SPI driver
@ -16,10 +16,10 @@ Reviewed-by: Jagan Teki <jagan@openedev.com>
create mode 100644 drivers/spi/sun4i_spi.c
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 75b794548b..b412f90802 100644
index c6900f449d..7cfdbe878a 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -439,6 +439,11 @@ config STM32_SPI
@@ -475,6 +475,11 @@ config STM32_SPI
SoCs. This uses driver model and requires a device tree binding to
operate.
@ -32,10 +32,10 @@ index 75b794548b..b412f90802 100644
bool "nVidia Tegra114 SPI driver"
help
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 4de77c260a..8137905972 100644
index 674d81caae..76b36986c0 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -67,6 +67,7 @@ obj-$(CONFIG_SPI_SUNXI) += spi-sunxi.o
@@ -71,6 +71,7 @@ obj-$(CONFIG_SPI_SUNXI) += spi-sunxi.o
obj-$(CONFIG_SH_QSPI) += sh_qspi.o
obj-$(CONFIG_STM32_QSPI) += stm32_qspi.o
obj-$(CONFIG_STM32_SPI) += stm32_spi.o
@ -506,5 +506,5 @@ index 0000000000..b86b5a00ad
+ .probe = sun4i_spi_probe,
+};
--
2.40.1
2.34.1

23
patch/u-boot/u-boot-sunxi/allwinner-add-support-for-Recore.patch
View File

@ -1,21 +1,21 @@
From a275e2cb3bfddc445f7f9c83d92e48830b57faf6 Mon Sep 17 00:00:00 2001
From 0d986679b1a17d80ce2cef42b36b0ee5a5e42aa7 Mon Sep 17 00:00:00 2001
From: Elias Bakken <elias@iagent.no>
Date: Tue, 7 Feb 2023 21:56:20 +0100
Subject: [PATCH] Add support for Recore
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/sun50i-a64-recore.dts | 257 +++++++++++++++++++++++++++++
configs/recore_defconfig | 22 +++
3 files changed, 280 insertions(+)
arch/arm/dts/sun50i-a64-recore.dts | 271 +++++++++++++++++++++++++++++
configs/recore_defconfig | 32 ++++
3 files changed, 304 insertions(+)
create mode 100644 arch/arm/dts/sun50i-a64-recore.dts
create mode 100644 configs/recore_defconfig
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index a7e0d9f6c0..2b981c0c8b 100644
index 43951a7731..1badd2e38e 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -718,6 +718,7 @@ dtb-$(CONFIG_MACH_SUN50I) += \
@@ -735,6 +735,7 @@ dtb-$(CONFIG_MACH_SUN50I) += \
sun50i-a64-pinephone-1.1.dtb \
sun50i-a64-pinephone-1.2.dtb \
sun50i-a64-pinetab.dtb \
@ -25,7 +25,7 @@ index a7e0d9f6c0..2b981c0c8b 100644
dtb-$(CONFIG_MACH_SUN9I) += \
diff --git a/arch/arm/dts/sun50i-a64-recore.dts b/arch/arm/dts/sun50i-a64-recore.dts
new file mode 100644
index 0000000000..2d29fe1556
index 0000000000..d704731873
--- /dev/null
+++ b/arch/arm/dts/sun50i-a64-recore.dts
@@ -0,0 +1,271 @@
@ -302,7 +302,7 @@ index 0000000000..2d29fe1556
+};
diff --git a/configs/recore_defconfig b/configs/recore_defconfig
new file mode 100644
index 0000000000..6ed99805ab
index 0000000000..2a7c40d276
--- /dev/null
+++ b/configs/recore_defconfig
@@ -0,0 +1,32 @@
@ -315,7 +315,7 @@ index 0000000000..6ed99805ab
+CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-recore"
+CONFIG_OF_LIST="sun50i-a64-recore"
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO=y
+CONFIG_PHY_REALTEK=y
+CONFIG_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
@ -338,5 +338,6 @@ index 0000000000..6ed99805ab
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_CMD_REGULATOR=y
--
2.30.2
--
2.34.1

44
patch/u-boot/u-boot-sunxi/allwinner-adjust-default-dram-clockspeeds.patch
View File

@ -1,5 +1,5 @@
diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
index 3627e4dd3a..8ceeccc2dd 100644
index f97dc131f2..bbb1034170 100644
--- a/configs/Lamobo_R1_defconfig
+++ b/configs/Lamobo_R1_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y
@ -12,7 +12,7 @@ index 3627e4dd3a..8ceeccc2dd 100644
CONFIG_MMC0_CD_PIN="PH10"
CONFIG_SATAPWR="PB3"
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 44a3901e22..c8c93c813f 100644
index 1fda0db4c9..e38d986ccd 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y
@ -25,7 +25,7 @@ index 44a3901e22..c8c93c813f 100644
CONFIG_SATAPWR="PH2"
CONFIG_AHCI=y
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index ba976f8f5f..ed3ac3215b 100644
index c89a9a1f9d..3405f3d70d 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y
@ -38,7 +38,7 @@ index ba976f8f5f..ed3ac3215b 100644
CONFIG_USB1_VBUS_PIN="PH26"
CONFIG_USB2_VBUS_PIN="PH22"
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 720e9e5df4..f06a42b018 100644
index 8757dcb461..2d0315b655 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y
@ -51,7 +51,7 @@ index 720e9e5df4..f06a42b018 100644
CONFIG_MMC0_CD_PIN="PH10"
CONFIG_MMC3_CD_PIN="PH11"
diff --git a/configs/a64-olinuxino_defconfig b/configs/a64-olinuxino_defconfig
index ccb5abc984..31d2965222 100644
index 16cef18bee..99fa24ae23 100644
--- a/configs/a64-olinuxino_defconfig
+++ b/configs/a64-olinuxino_defconfig
@@ -6,6 +6,8 @@ CONFIG_MACH_SUN50I=y
@ -60,11 +60,11 @@ index ccb5abc984..31d2965222 100644
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_DRAM_CLK=624
+CONFIG_DRAM_ZQ=3881949
CONFIG_SPL_STACK=0x54000
CONFIG_SYS_PBSIZE=1024
CONFIG_SYS_BOOTM_LEN=0x2000000
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
diff --git a/configs/nanopi_m1_plus_defconfig b/configs/nanopi_m1_plus_defconfig
index c71d721f74..b839b78f4c 100644
index 37b7817d86..4953e09c18 100644
--- a/configs/nanopi_m1_plus_defconfig
+++ b/configs/nanopi_m1_plus_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y
@ -77,7 +77,7 @@ index c71d721f74..b839b78f4c 100644
CONFIG_MMC0_CD_PIN="PH13"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
index 3f834b756d..a67ea397c4 100644
index 924ff38f17..5171cb4800 100644
--- a/configs/nanopi_neo_plus2_defconfig
+++ b/configs/nanopi_neo_plus2_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y
@ -90,7 +90,7 @@ index 3f834b756d..a67ea397c4 100644
# CONFIG_DRAM_ODT_EN is not set
CONFIG_MACPWR="PD6"
diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig
index c7174170db..d5123a39dd 100644
index 96bbd1bab6..ab64319875 100644
--- a/configs/orangepi_lite_defconfig
+++ b/configs/orangepi_lite_defconfig
@@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y
@ -102,10 +102,10 @@ index c7174170db..d5123a39dd 100644
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_STACK=0x8000
CONFIG_SYS_PBSIZE=1024
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
index 112ff5e5b6..12695f0fa4 100644
index 1064b4a39d..cbe2c97f2b 100644
--- a/configs/orangepi_one_defconfig
+++ b/configs/orangepi_one_defconfig
@@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y
@ -117,10 +117,10 @@ index 112ff5e5b6..12695f0fa4 100644
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_STACK=0x8000
CONFIG_SYS_PBSIZE=1024
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig
index d0cad2a746..7536b39dc7 100644
index 777af8c60e..5a7dbd45e8 100644
--- a/configs/orangepi_pc2_defconfig
+++ b/configs/orangepi_pc2_defconfig
@@ -3,8 +3,9 @@ CONFIG_ARCH_SUNXI=y
@ -135,7 +135,7 @@ index d0cad2a746..7536b39dc7 100644
CONFIG_SPL_SPI_SUNXI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig
index 85b25ddd16..ac1880d178 100644
index 138a6a72b8..879f01dcd8 100644
--- a/configs/orangepi_plus2e_defconfig
+++ b/configs/orangepi_plus2e_defconfig
@@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y
@ -150,7 +150,7 @@ index 85b25ddd16..ac1880d178 100644
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
index dff0a2fd6e..ce52ed911a 100644
index 76de72aa22..aa3f51e97b 100644
--- a/configs/orangepi_plus_defconfig
+++ b/configs/orangepi_plus_defconfig
@@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y
@ -165,7 +165,7 @@ index dff0a2fd6e..ce52ed911a 100644
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_USB1_VBUS_PIN="PG13"
diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
index 690a5f195b..655ac510cd 100644
index 95a82e20f3..551348f8c6 100644
--- a/configs/orangepi_prime_defconfig
+++ b/configs/orangepi_prime_defconfig
@@ -3,8 +3,9 @@ CONFIG_ARCH_SUNXI=y
@ -178,9 +178,9 @@ index 690a5f195b..655ac510cd 100644
+CONFIG_DRAM_ODT_EN=y
# CONFIG_DRAM_ODT_EN is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_STACK=0x54000
CONFIG_SUN8I_EMAC=y
diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig
index 02f70ccf0c..4f227c73b3 100644
index 9583d24c8d..77a3ad5b83 100644
--- a/configs/orangepi_zero_plus2_defconfig
+++ b/configs/orangepi_zero_plus2_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y

26
patch/u-boot/u-boot-sunxi/allwinner-boot-splash.patch
View File

@ -1,4 +1,4 @@
From 25e72a7d86f8eb8fa93df7c46ec6f91b60233bbb Mon Sep 17 00:00:00 2001
From a35a53fd1e4b82dc1bf441b6986fffa87c30400d Mon Sep 17 00:00:00 2001
From: The Going <48602507+The-going@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:57:09 +0300
Subject: [PATCH] sunxi boot splash
@ -10,24 +10,24 @@ Subject: [PATCH] sunxi boot splash
3 files changed, 40 insertions(+)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 0e0be94f41..b21fc797b0 100644
index b2d7598717..ccd585bb24 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1851,6 +1851,7 @@ menu "Misc commands"
@@ -1912,6 +1912,7 @@ menu "Misc commands"
config CMD_BMP
bool "Enable 'bmp' command"
depends on LCD || DM_VIDEO || VIDEO
depends on VIDEO
+ default y
help
This provides a way to obtain information about a BMP-format image
and to display it. BMP (which presumably stands for BitMaP) is a
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 5506f3168f..4f236979e9 100644
index c3a2414b91..3f75840f27 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -438,6 +438,15 @@
BOOTENV_SHARED_EFI \
@@ -469,6 +469,15 @@
BOOTENV_SHARED_VIRTIO \
BOOTENV_SHARED_EXTENSION \
"boot_prefixes=/ /boot/\0" \
+ "splashpos=m,m\0" \
+ "splashimage=66000000\0" \
@ -42,14 +42,14 @@ index 5506f3168f..4f236979e9 100644
"boot_script_dhcp=boot.scr.uimg\0" \
BOOTENV_BOOT_TARGETS \
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 0f0ef4f64b..fc85399978 100644
index e89ad42ce8..54fee64bcc 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -114,6 +114,30 @@
@@ -106,6 +106,30 @@
#define LOW_LEVEL_SRAM_STACK 0x00008000 /* End of sram */
#endif
+#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO
+#if defined CONFIG_VIDEO
+#if !defined CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_LOGO
+#endif
@ -76,11 +76,11 @@ index 0f0ef4f64b..fc85399978 100644
/* Ethernet support */
#ifdef CONFIG_ARM64
@@ -291,8 +315,14 @@
@@ -286,8 +310,14 @@
#include <config_distro_bootcmd.h>
#ifdef CONFIG_USB_KEYBOARD
+#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO
+#if defined CONFIG_VIDEO
+#define CONSOLE_STDIN_SETTINGS \
+ "preboot=run loadsplash; usb start\0" \
+ "stdin=serial,usbkbd\0"
@ -92,5 +92,5 @@ index 0f0ef4f64b..fc85399978 100644
#define CONSOLE_STDIN_SETTINGS \
"stdin=serial\0"
--
2.40.1
2.34.1

122
patch/u-boot/u-boot-sunxi/allwinner-disable-de2-to-improve-edid-detection.patch
View File

@ -1,248 +1,248 @@
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index eb3e798800..94caa7b4e1 100644
index f5b6d908cd..9adced2d4b 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -21,3 +21,4 @@ CONFIG_SUN4I_EMAC=y
@@ -19,3 +19,4 @@ CONFIG_SUN4I_EMAC=y
CONFIG_SCSI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index f06a42b018..9d0c822ab8 100644
index 2d0315b655..dbc6a2556d 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -30,3 +30,4 @@ CONFIG_SUN7I_GMAC=y
@@ -28,3 +28,4 @@ CONFIG_SUN7I_GMAC=y
CONFIG_SCSI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/a64-olinuxino-emmc_defconfig b/configs/a64-olinuxino-emmc_defconfig
index afa0c24b68..3ac8e44c5f 100644
index 8ec9eb3e9c..4ccb4c8467 100644
--- a/configs/a64-olinuxino-emmc_defconfig
+++ b/configs/a64-olinuxino-emmc_defconfig
@@ -13,3 +13,4 @@ CONFIG_SUPPORT_EMMC_BOOT=y
@@ -10,3 +10,4 @@ CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/a64-olinuxino_defconfig b/configs/a64-olinuxino_defconfig
index 31d2965222..2042fec5c9 100644
index 99fa24ae23..d00bd9e7e3 100644
--- a/configs/a64-olinuxino_defconfig
+++ b/configs/a64-olinuxino_defconfig
@@ -14,3 +14,4 @@ CONFIG_SYS_BOOTM_LEN=0x2000000
@@ -11,3 +11,4 @@ CONFIG_DRAM_ZQ=3881949
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/bananapi_m1_plus_defconfig b/configs/bananapi_m1_plus_defconfig
index 290e9c17e2..570f9b161b 100644
index 0fbb619d62..f3b1651fa5 100644
--- a/configs/bananapi_m1_plus_defconfig
+++ b/configs/bananapi_m1_plus_defconfig
@@ -26,3 +26,4 @@ CONFIG_SUN7I_GMAC=y
@@ -24,3 +24,4 @@ CONFIG_SUN7I_GMAC=y
CONFIG_SCSI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/bananapi_m2_plus_h3_defconfig b/configs/bananapi_m2_plus_h3_defconfig
index d0981f6481..7b0b1b27e9 100644
index 26ced59fb0..a723dc4847 100644
--- a/configs/bananapi_m2_plus_h3_defconfig
+++ b/configs/bananapi_m2_plus_h3_defconfig
@@ -13,3 +13,4 @@ CONFIG_SUN8I_EMAC=y
@@ -11,3 +11,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/bananapi_m2_plus_h5_defconfig b/configs/bananapi_m2_plus_h5_defconfig
index a68742e9d6..62ec3c8cd1 100644
index fb6c945919..2e4ecdfbe8 100644
--- a/configs/bananapi_m2_plus_h5_defconfig
+++ b/configs/bananapi_m2_plus_h5_defconfig
@@ -14,3 +14,4 @@ CONFIG_SUN8I_EMAC=y
@@ -11,3 +11,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/bananapi_m2_zero_defconfig b/configs/bananapi_m2_zero_defconfig
index 6a3594c093..6c1ba5e7b2 100644
index ac3f8f5ab8..58ce3e170f 100644
--- a/configs/bananapi_m2_zero_defconfig
+++ b/configs/bananapi_m2_zero_defconfig
@@ -8,3 +8,4 @@ CONFIG_MMC0_CD_PIN=""
@@ -6,3 +6,4 @@ CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=408
CONFIG_MMC0_CD_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_STACK=0x8000
CONFIG_SYS_PBSIZE=1024
+CONFIG_VIDEO_DE2=n
diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig
index 36aa80a09b..a0fbb1d9d5 100644
index 5463b046fd..073e7fd911 100644
--- a/configs/bananapi_m64_defconfig
+++ b/configs/bananapi_m64_defconfig
@@ -15,3 +15,4 @@ CONFIG_SUN8I_EMAC=y
@@ -12,3 +12,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/libretech_all_h3_cc_h2_plus_defconfig b/configs/libretech_all_h3_cc_h2_plus_defconfig
index ca99556802..58062deed9 100644
index 8725fe64cd..e2b58e47f5 100644
--- a/configs/libretech_all_h3_cc_h2_plus_defconfig
+++ b/configs/libretech_all_h3_cc_h2_plus_defconfig
@@ -11,3 +11,4 @@ CONFIG_SYS_PBSIZE=1024
@@ -9,3 +9,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/libretech_all_h3_cc_h3_defconfig b/configs/libretech_all_h3_cc_h3_defconfig
index 7ca312c8fb..c18f215e9d 100644
index 5275fdc36d..11cd4e0fe3 100644
--- a/configs/libretech_all_h3_cc_h3_defconfig
+++ b/configs/libretech_all_h3_cc_h3_defconfig
@@ -11,3 +11,4 @@ CONFIG_SYS_PBSIZE=1024
@@ -9,3 +9,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/libretech_all_h3_cc_h5_defconfig b/configs/libretech_all_h3_cc_h5_defconfig
index 13ff758212..e0b77f896c 100644
index 9627401949..6fefb6756d 100644
--- a/configs/libretech_all_h3_cc_h5_defconfig
+++ b/configs/libretech_all_h3_cc_h5_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_BOOTM_LEN=0x2000000
@@ -9,3 +9,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/libretech_all_h5_cc_h5_defconfig b/configs/libretech_all_h5_cc_h5_defconfig
index f42747e946..e0bfe910b7 100644
index c3aa4b1061..55e4313961 100644
--- a/configs/libretech_all_h5_cc_h5_defconfig
+++ b/configs/libretech_all_h5_cc_h5_defconfig
@@ -15,3 +15,4 @@ CONFIG_SUN8I_EMAC=y
@@ -12,3 +12,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_SPI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/nanopi_a64_defconfig b/configs/nanopi_a64_defconfig
index 226ccaa12f..023518fbde 100644
index 70fc257eeb..3eb285ee98 100644
--- a/configs/nanopi_a64_defconfig
+++ b/configs/nanopi_a64_defconfig
@@ -11,3 +11,4 @@ CONFIG_SYS_BOOTM_LEN=0x2000000
@@ -8,3 +8,4 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/nanopi_m1_defconfig b/configs/nanopi_m1_defconfig
index 47a6b7804e..330f7a4e2f 100644
index dc2dbd6290..5abf34aa34 100644
--- a/configs/nanopi_m1_defconfig
+++ b/configs/nanopi_m1_defconfig
@@ -9,3 +9,4 @@ CONFIG_SPL_STACK=0x8000
CONFIG_SYS_PBSIZE=1024
@@ -7,3 +7,4 @@ CONFIG_DRAM_CLK=408
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_lite2_defconfig b/configs/orangepi_lite2_defconfig
index 14c8806281..85bea8f1c8 100644
index 75c97d6b89..389687a456 100644
--- a/configs/orangepi_lite2_defconfig
+++ b/configs/orangepi_lite2_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_PBSIZE=1024
CONFIG_SYS_BOOTM_LEN=0x2000000
@@ -9,3 +9,4 @@ CONFIG_MMC0_CD_PIN="PF6"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig
index d5123a39dd..c5d33b5b01 100644
index ab64319875..1a5ea7fe4d 100644
--- a/configs/orangepi_lite_defconfig
+++ b/configs/orangepi_lite_defconfig
@@ -11,3 +11,4 @@ CONFIG_SPL_STACK=0x8000
CONFIG_SYS_PBSIZE=1024
@@ -9,3 +9,4 @@ CONFIG_DRAM_ODT_EN=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
index 12695f0fa4..1386eabcaf 100644
index cbe2c97f2b..4572c76579 100644
--- a/configs/orangepi_one_defconfig
+++ b/configs/orangepi_one_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_PBSIZE=1024
@@ -10,3 +10,4 @@ CONFIG_DRAM_ODT_EN=y
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_one_plus_defconfig b/configs/orangepi_one_plus_defconfig
index a4336332fc..0057e490a7 100644
index 55a8b003fb..19db83a680 100644
--- a/configs/orangepi_one_plus_defconfig
+++ b/configs/orangepi_one_plus_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_PBSIZE=1024
CONFIG_SYS_BOOTM_LEN=0x2000000
@@ -9,3 +9,4 @@ CONFIG_MMC0_CD_PIN="PF6"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig
index 7536b39dc7..c9a36ecd69 100644
index 5a7dbd45e8..cb8ca5d981 100644
--- a/configs/orangepi_pc2_defconfig
+++ b/configs/orangepi_pc2_defconfig
@@ -23,3 +23,4 @@ CONFIG_SPI=y
@@ -20,3 +20,4 @@ CONFIG_SPI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig
index 28107ad5f7..03eb82b1f6 100644
index 905ff7b127..4aacb83bab 100644
--- a/configs/orangepi_pc_defconfig
+++ b/configs/orangepi_pc_defconfig
@@ -14,3 +14,4 @@ CONFIG_SUN8I_EMAC=y
@@ -12,3 +12,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_SY8106A_POWER=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig
index ac1880d178..4194435c3d 100644
index 879f01dcd8..96ce325066 100644
--- a/configs/orangepi_plus2e_defconfig
+++ b/configs/orangepi_plus2e_defconfig
@@ -18,3 +18,4 @@ CONFIG_SUN8I_EMAC=y
@@ -16,3 +16,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_SY8106A_POWER=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
index ce52ed911a..c43e4631e3 100644
index aa3f51e97b..4b2ac4e05c 100644
--- a/configs/orangepi_plus_defconfig
+++ b/configs/orangepi_plus_defconfig
@@ -20,3 +20,4 @@ CONFIG_SUN8I_EMAC=y
@@ -18,3 +18,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_SY8106A_POWER=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
index 655ac510cd..9c909f3d87 100644
index 551348f8c6..2e19c27942 100644
--- a/configs/orangepi_prime_defconfig
+++ b/configs/orangepi_prime_defconfig
@@ -15,3 +15,4 @@ CONFIG_SUN8I_EMAC=y
@@ -12,3 +12,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig
index 7a9ca8e88a..619cc3282e 100644
index 3b78ad7e52..eba4af1bda 100644
--- a/configs/orangepi_win_defconfig
+++ b/configs/orangepi_win_defconfig
@@ -16,3 +16,4 @@ CONFIG_SUN8I_EMAC=y
@@ -13,3 +13,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_SPI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/pine64-lts_defconfig b/configs/pine64-lts_defconfig
index 3f9ea1e329..55d0dc57e1 100644
index 7e7c2d7910..dca89ec763 100644
--- a/configs/pine64-lts_defconfig
+++ b/configs/pine64-lts_defconfig
@@ -19,3 +19,4 @@ CONFIG_SUN8I_EMAC=y
@@ -16,3 +16,4 @@ CONFIG_SUN8I_EMAC=y
CONFIG_SPI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig
index 62608f93bd..e9e3bdee0d 100644
index f42f4e5923..400519cd89 100644
--- a/configs/pine64_plus_defconfig
+++ b/configs/pine64_plus_defconfig
@@ -14,3 +14,4 @@ CONFIG_PHY_REALTEK=y
@@ -11,3 +11,4 @@ CONFIG_PHY_REALTEK=y
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_VIDEO_DE2=n
diff --git a/configs/pine_h64_defconfig b/configs/pine_h64_defconfig
index 2f511c8051..00183e32a3 100644
index 09a4275f0e..9c4a01fa21 100644
--- a/configs/pine_h64_defconfig
+++ b/configs/pine_h64_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y

10
patch/u-boot/u-boot-sunxi/allwinner-enable-autoboot-keyed.patch
View File

@ -1,8 +1,8 @@
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 82cd456f51..d726bbf4b3 100644
index cac4fa09fd..ff46730bfb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1176,6 +1176,8 @@ config ARCH_SUNXI
@@ -1121,6 +1121,8 @@ config ARCH_SUNXI
select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST
select USB_STORAGE if DISTRO_DEFAULTS && USB_HOST
select SPL_USE_TINY_PRINTF
@ -12,10 +12,10 @@ index 82cd456f51..d726bbf4b3 100644
select SYS_RELOC_GD_ENV_ADDR
imply BOARD_LATE_INIT
diff --git a/boot/Kconfig b/boot/Kconfig
index 6b3b8f072c..5f913fe05c 100644
index 424ad0e466..d139ff9203 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1050,7 +1050,7 @@ config AUTOBOOT_FLUSH_STDIN
@@ -1189,7 +1189,7 @@ config AUTOBOOT_FLUSH_STDIN
config AUTOBOOT_PROMPT
string "Autoboot stop prompt"
depends on AUTOBOOT_KEYED
@ -24,7 +24,7 @@ index 6b3b8f072c..5f913fe05c 100644
help
This string is displayed before the boot delay selected by
CONFIG_BOOTDELAY starts. If it is not defined there is no
@@ -1105,6 +1105,7 @@ config AUTOBOOT_DELAY_STR
@@ -1244,6 +1244,7 @@ config AUTOBOOT_DELAY_STR
config AUTOBOOT_STOP_STR
string "Stop autobooting via specific input key / string"
depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION

4
patch/u-boot/u-boot-sunxi/allwinner-enable-r_pio-gpio-access-h3-h5.patch
View File

@ -1,5 +1,5 @@
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 8f7c894286..76495fa900 100644
index 0c4b6dd1ca..5d0bb5e451 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -26,6 +26,7 @@
@ -10,7 +10,7 @@ index 8f7c894286..76495fa900 100644
#include <linux/compiler.h>
@@ -78,6 +79,11 @@ ulong board_get_usable_ram_top(ulong total_size)
@@ -78,6 +79,11 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size)
#ifdef CONFIG_SPL_BUILD
static int gpio_init(void)
{

4
patch/u-boot/u-boot-sunxi/allwinner-fdt-setprop-fix-unaligned-access.patch
View File

@ -1,5 +1,5 @@
diff --git a/cmd/fdt.c b/cmd/fdt.c
index 6fbd9205d3..454f5672fc 100644
index 8e51a43126..0e94bf30ee 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -18,6 +18,7 @@
@ -10,7 +10,7 @@ index 6fbd9205d3..454f5672fc 100644
#define MAX_LEVEL 32 /* how deeply nested we will go */
#define SCRATCHPAD 1024 /* bytes of scratchpad memory */
@@ -798,7 +799,10 @@ static int fdt_parse_prop(char * const *newval, int count, char *data, int *len)
@@ -802,7 +803,10 @@ static int fdt_parse_prop(char * const *newval, int count, char *data, int *len)
cp = newp;
tmp = simple_strtoul(cp, &newp, 0);
if (*cp != '?')

4
patch/u-boot/u-boot-sunxi/allwinner-h3-enable-power-led.patch
View File

@ -1,8 +1,8 @@
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 21a2407e06..09f4a0b8c3 100644
index 827e545032..7d343a93b2 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -580,6 +580,11 @@ void sunxi_board_init(void)
@@ -581,6 +581,11 @@ void sunxi_board_init(void)
status_led_init();
#endif

8
patch/u-boot/u-boot-sunxi/allwinner-h3-fix-pll1-setup-to-never-use-dividers.patch
View File

@ -1,4 +1,4 @@
From 7f5071f906f79bdc99d6b4b0ccf0cb280abe740b Mon Sep 17 00:00:00 2001
From 2bd59104066b4daf9157c573e2ac747accd1ebd6 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megous@megous.com>
Date: Tue, 20 Dec 2016 11:25:12 +0100
Subject: [PATCH] sunxi: h3: Fix PLL1 setup to never use dividers
@ -10,10 +10,10 @@ lock up.
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
index 50fb302a19..91aa2a0478 100644
index 6bd75a15f6..86f08ab717 100644
--- a/arch/arm/mach-sunxi/clock_sun6i.c
+++ b/arch/arm/mach-sunxi/clock_sun6i.c
@@ -94,11 +94,10 @@ void clock_set_pll1(unsigned int clk)
@@ -134,11 +134,10 @@ void clock_set_pll1(unsigned int clk)
int k = 1;
int m = 1;
@ -29,5 +29,5 @@ index 50fb302a19..91aa2a0478 100644
/* Switch to 24MHz clock while changing PLL1 */
--
2.11.0
2.34.1

2
patch/u-boot/u-boot-sunxi/allwinner-h3-set-safe-axi_apb-clock-dividers.patch
View File

@ -11,7 +11,7 @@ index 7fcf340db6..723113b10b 100644
#define CCM_PLL3_CTRL_M_SHIFT 0
#define CCM_PLL3_CTRL_M_MASK (0xf << CCM_PLL3_CTRL_M_SHIFT)
diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
index 23989c6f1b..aec9e56202 100644
index 86f08ab717..0c403204c5 100644
--- a/arch/arm/mach-sunxi/clock_sun6i.c
+++ b/arch/arm/mach-sunxi/clock_sun6i.c
@@ -158,15 +158,17 @@ void clock_set_pll1(unsigned int clk)

11
patch/u-boot/u-boot-sunxi/allwinner-h616-GPU-enable-hack.patch
View File

@ -1,15 +1,15 @@
From d420184997f302f546bb0862b1774cca6b43fb9a Mon Sep 17 00:00:00 2001
From 8064f0b57b15ff957b9b33099662870302e42664 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Sat, 16 Oct 2021 21:33:35 +0200
Subject: [PATCH] sunxi: H616 GPU enable hack
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
arch/arm/mach-sunxi/clock_sun50i_h6.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/mach-sunxi/clock_sun50i_h6.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-sunxi/clock_sun50i_h6.c b/arch/arm/mach-sunxi/clock_sun50i_h6.c
index 7926394c..f12f9625 100644
index 7926394cf7..f12f962530 100644
--- a/arch/arm/mach-sunxi/clock_sun50i_h6.c
+++ b/arch/arm/mach-sunxi/clock_sun50i_h6.c
@@ -16,6 +16,8 @@ void clock_init_safe(void)
@ -21,3 +21,6 @@ index 7926394c..f12f9625 100644
}
clrbits_le32(&prcm->res_cal_ctrl, 1);
--
2.34.1

8
patch/u-boot/u-boot-sunxi/allwinner-h616-THS-workaround.patch
View File

@ -1,4 +1,4 @@
From 07bdfe1e2ebc51a434dbe66733378a979530abb0 Mon Sep 17 00:00:00 2001
From ed7573fab40ebbfebbce0f1e1f23e63096417f26 Mon Sep 17 00:00:00 2001
From: Kali Prasad <kprasadvnsi@protonmail.com>
Date: Sat, 18 Sep 2021 22:57:05 +0530
Subject: [PATCH] Adding h616 THS workaround.
@ -9,10 +9,10 @@ Signed-off-by: Kali Prasad <kprasadvnsi@protonmail.com>
1 file changed, 9 insertions(+)
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 1a46100e40..9f0c6d99ba 100644
index 7d343a93b2..3079ac0002 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -293,6 +293,15 @@ int board_init(void)
@@ -247,6 +247,15 @@ int board_init(void)
}
}
@ -29,5 +29,5 @@ index 1a46100e40..9f0c6d99ba 100644
/*
* Temporary workaround for enabling I2C clocks until proper sunxi DM
--
2.25.1
2.34.1

4
patch/u-boot/u-boot-sunxi/allwinner-lower-default-DRAM-freq-A64-H5.patch
View File

@ -1,8 +1,8 @@
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 5712576184..459d7baa29 100644
index dbe6005daa..41e19ba102 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -465,7 +465,7 @@ config DRAM_CLK
@@ -467,7 +467,7 @@ config DRAM_CLK
default 312 if MACH_SUN6I || MACH_SUN8I
default 360 if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || \
MACH_SUN8I_V3S

7
patch/u-boot/u-boot-sunxi/board_nanopiair/adjust-small-boards-cpufreq.patch
View File

@ -1,12 +1,11 @@
diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
index 4b13290130..3c5320ed19 100644
index 806d95c1cc..b418f22360 100644
--- a/configs/nanopi_neo_air_defconfig
+++ b/configs/nanopi_neo_air_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=408
@@ -7,5 +7,6 @@ CONFIG_DRAM_CLK=408
# CONFIG_VIDEO_DE2 is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CLK_FREQ=480000000
CONFIG_SPL_STACK=0x8000
CONFIG_SYS_PBSIZE=1024
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y

10
patch/u-boot/u-boot-sunxi/board_orangepiprime/enable-ethernet-orangepiprime.patch
View File

@ -1,11 +1,11 @@
diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
index 9c909f3d87..28ca65aabf 100644
index 2e19c27942..09891d12de 100644
--- a/configs/orangepi_prime_defconfig
+++ b/configs/orangepi_prime_defconfig
@@ -11,6 +11,8 @@ CONFIG_DRAM_ODT_EN=y
CONFIG_SPL_STACK=0x54000
CONFIG_SYS_PBSIZE=1024
CONFIG_SYS_BOOTM_LEN=0x2000000
@@ -8,6 +8,8 @@ CONFIG_DRAM_ZQ=3881977
CONFIG_DRAM_ODT_EN=y
# CONFIG_DRAM_ODT_EN is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_MACPWR="PD6"
+CONFIG_SPL_SPI_SUNXI=y
CONFIG_SUN8I_EMAC=y

10
patch/u-boot/u-boot-sunxi/board_orangepizeroplus/add-orangepi-zero-plus-pxe-support.patch
View File

@ -1,11 +1,11 @@
diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig
index 15520955f5..cf1ad5071b 100644
index f3ecf35eee..affa91984f 100644
--- a/configs/orangepi_zero_plus_defconfig
+++ b/configs/orangepi_zero_plus_defconfig
@@ -10,6 +10,8 @@ CONFIG_DRAM_ZQ=3881977
CONFIG_SPL_STACK=0x54000
CONFIG_SYS_PBSIZE=1024
CONFIG_SYS_BOOTM_LEN=0x2000000
@@ -7,6 +7,8 @@ CONFIG_DRAM_CLK=624
CONFIG_DRAM_ZQ=3881977
# CONFIG_DRAM_ODT_EN is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_MACPWR="PD6"
+CONFIG_SPL_SPI_SUNXI=y
CONFIG_SUN8I_EMAC=y

541
patch/u-boot/u-boot-sunxi/sunxi-dts-arm64-update-devicetree-files-from-Linux-v6.2-rc2.patch Normal file
View File

@ -0,0 +1,541 @@
From 8e2c0ee3bafbc283b58b66d9007847a5a3ed07be Mon Sep 17 00:00:00 2001
From: Andre Przywara <andre.przywara@arm.com>
Date: Thu, 12 Jan 2023 11:22:20 +0000
Subject: [PATCH] sunxi: dts: arm64: update devicetree files from Linux
v6.2-rc2
Sync the devicetree files from the Linux kernel repo, v6.2-rc2.
This is covering the 64-bit SoCs, from arch/arm64/boot/dts/allwinner.
This enables GPU power management in the kernel for the H6, enables
Bluetooth on the Pinebook, and adds USB to the H616 devices (just
for newer Linux kernels at the moment, U-Boot support is pending).
As before, this omits the non-backwards compatible changes to the R_INTC
controller, to remain compatible with older kernels.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
arch/arm/dts/axp803.dtsi | 10 --
arch/arm/dts/sun50i-a64-pinebook.dts | 14 ++
arch/arm/dts/sun50i-h6-beelink-gs1.dts | 1 +
arch/arm/dts/sun50i-h6-gpu-opp.dtsi | 87 +++++++++++
arch/arm/dts/sun50i-h6.dtsi | 52 ++++++-
arch/arm/dts/sun50i-h616-orangepi-zero2.dts | 41 +++++
arch/arm/dts/sun50i-h616-x96-mate.dts | 25 +++
arch/arm/dts/sun50i-h616.dtsi | 160 ++++++++++++++++++++
8 files changed, 378 insertions(+), 12 deletions(-)
create mode 100644 arch/arm/dts/sun50i-h6-gpu-opp.dtsi
diff --git a/arch/arm/dts/axp803.dtsi b/arch/arm/dts/axp803.dtsi
index 578ef368e2b4..a6b4b87f185d 100644
--- a/arch/arm/dts/axp803.dtsi
+++ b/arch/arm/dts/axp803.dtsi
@@ -25,16 +25,6 @@
compatible = "x-powers,axp803-gpio", "x-powers,axp813-gpio";
gpio-controller;
#gpio-cells = <2>;
-
- gpio0_ldo: gpio0-ldo-pin {
- pins = "GPIO0";
- function = "ldo";
- };
-
- gpio1_ldo: gpio1-ldo-pin {
- pins = "GPIO1";
- function = "ldo";
- };
};
battery_power_supply: battery-power {
diff --git a/arch/arm/dts/sun50i-a64-pinebook.dts b/arch/arm/dts/sun50i-a64-pinebook.dts
index c00c4c1e9e73..576eae132230 100644
--- a/arch/arm/dts/sun50i-a64-pinebook.dts
+++ b/arch/arm/dts/sun50i-a64-pinebook.dts
@@ -406,6 +406,20 @@
status = "okay";
};
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+ uart-has-rtscts;
+ status = "okay";
+
+ bluetooth {
+ compatible = "realtek,rtl8723cs-bt";
+ device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL5 */
+ enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
+ host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+ };
+};
+
&usb_otg {
dr_mode = "host";
};
diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
index 649b146dfff8..d6897ec97998 100644
--- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts
+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
@@ -5,6 +5,7 @@
#include "sun50i-h6.dtsi"
#include "sun50i-h6-cpu-opp.dtsi"
+#include "sun50i-h6-gpu-opp.dtsi"
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/dts/sun50i-h6-gpu-opp.dtsi b/arch/arm/dts/sun50i-h6-gpu-opp.dtsi
new file mode 100644
index 000000000000..b48049c4fc85
--- /dev/null
+++ b/arch/arm/dts/sun50i-h6-gpu-opp.dtsi
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// Copyright (C) 2022 Clément Péron <peron.clem@gmail.com>
+
+/ {
+ gpu_opp_table: opp-table-gpu {
+ compatible = "operating-points-v2";
+
+ opp-216000000 {
+ opp-hz = /bits/ 64 <216000000>;
+ opp-microvolt = <810000 810000 1200000>;
+ };
+
+ opp-264000000 {
+ opp-hz = /bits/ 64 <264000000>;
+ opp-microvolt = <810000 810000 1200000>;
+ };
+
+ opp-312000000 {
+ opp-hz = /bits/ 64 <312000000>;
+ opp-microvolt = <810000 810000 1200000>;
+ };
+
+ opp-336000000 {
+ opp-hz = /bits/ 64 <336000000>;
+ opp-microvolt = <810000 810000 1200000>;
+ };
+
+ opp-360000000 {
+ opp-hz = /bits/ 64 <360000000>;
+ opp-microvolt = <820000 820000 1200000>;
+ };
+
+ opp-384000000 {
+ opp-hz = /bits/ 64 <384000000>;
+ opp-microvolt = <830000 830000 1200000>;
+ };
+
+ opp-408000000 {
+ opp-hz = /bits/ 64 <408000000>;
+ opp-microvolt = <840000 840000 1200000>;
+ };
+
+ opp-420000000 {
+ opp-hz = /bits/ 64 <420000000>;
+ opp-microvolt = <850000 850000 1200000>;
+ };
+
+ opp-432000000 {
+ opp-hz = /bits/ 64 <432000000>;
+ opp-microvolt = <860000 860000 1200000>;
+ };
+
+ opp-456000000 {
+ opp-hz = /bits/ 64 <456000000>;
+ opp-microvolt = <870000 870000 1200000>;
+ };
+
+ opp-504000000 {
+ opp-hz = /bits/ 64 <504000000>;
+ opp-microvolt = <890000 890000 1200000>;
+ };
+
+ opp-540000000 {
+ opp-hz = /bits/ 64 <540000000>;
+ opp-microvolt = <910000 910000 1200000>;
+ };
+
+ opp-576000000 {
+ opp-hz = /bits/ 64 <576000000>;
+ opp-microvolt = <930000 930000 1200000>;
+ };
+
+ opp-624000000 {
+ opp-hz = /bits/ 64 <624000000>;
+ opp-microvolt = <950000 950000 1200000>;
+ };
+
+ opp-756000000 {
+ opp-hz = /bits/ 64 <756000000>;
+ opp-microvolt = <1040000 1040000 1200000>;
+ };
+ };
+};
+
+&gpu {
+ operating-points-v2 = <&gpu_opp_table>;
+};
diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi
index afbbfc252697..3c85c8cc8eaa 100644
--- a/arch/arm/dts/sun50i-h6.dtsi
+++ b/arch/arm/dts/sun50i-h6.dtsi
@@ -161,6 +161,7 @@
clocks = <&ccu CLK_BUS_VP9>, <&ccu CLK_VP9>;
clock-names = "bus", "mod";
resets = <&ccu RST_BUS_VP9>;
+ iommus = <&iommu 5>;
};
video-codec@1c0e000 {
@@ -186,6 +187,7 @@
clocks = <&ccu CLK_GPU>, <&ccu CLK_BUS_GPU>;
clock-names = "core", "bus";
resets = <&ccu RST_BUS_GPU>;
+ #cooling-cells = <2>;
status = "disabled";
};
@@ -1070,9 +1072,55 @@
};
gpu-thermal {
- polling-delay-passive = <0>;
- polling-delay = <0>;
+ polling-delay-passive = <1000>;
+ polling-delay = <2000>;
thermal-sensors = <&ths 1>;
+
+ trips {
+ gpu_alert0: gpu-alert-0 {
+ temperature = <95000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+
+ gpu_alert1: gpu-alert-1 {
+ temperature = <100000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+
+ gpu_alert2: gpu-alert-2 {
+ temperature = <105000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+
+ gpu-crit {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "critical";
+ };
+ };
+
+ cooling-maps {
+ // Forbid the GPU to go over 756MHz
+ map0 {
+ trip = <&gpu_alert0>;
+ cooling-device = <&gpu 1 THERMAL_NO_LIMIT>;
+ };
+
+ // Forbid the GPU to go over 624MHz
+ map1 {
+ trip = <&gpu_alert1>;
+ cooling-device = <&gpu 2 THERMAL_NO_LIMIT>;
+ };
+
+ // Forbid the GPU to go over 576MHz
+ map2 {
+ trip = <&gpu_alert2>;
+ cooling-device = <&gpu 3 THERMAL_NO_LIMIT>;
+ };
+ };
};
};
};
diff --git a/arch/arm/dts/sun50i-h616-orangepi-zero2.dts b/arch/arm/dts/sun50i-h616-orangepi-zero2.dts
index 02893f3ac99d..cb8600d0ea1e 100644
--- a/arch/arm/dts/sun50i-h616-orangepi-zero2.dts
+++ b/arch/arm/dts/sun50i-h616-orangepi-zero2.dts
@@ -49,8 +49,24 @@
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
+
+ reg_usb1_vbus: regulator-usb1-vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb1-vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&reg_vcc5v>;
+ enable-active-high;
+ gpio = <&pio 2 16 GPIO_ACTIVE_HIGH>; /* PC16 */
+ };
};
+&ehci1 {
+ status = "okay";
+};
+
+/* USB 2 & 3 are on headers only. */
+
&emac0 {
pinctrl-names = "default";
pinctrl-0 = <&ext_rgmii_pins>;
@@ -76,6 +92,10 @@
status = "okay";
};
+&ohci1 {
+ status = "okay";
+};
+
&r_rsb {
status = "okay";
@@ -211,3 +231,24 @@
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
+
+&usbotg {
+ /*
+ * PHY0 pins are connected to a USB-C socket, but a role switch
+ * is not implemented: both CC pins are pulled to GND.
+ * The VBUS pins power the device, so a fixed peripheral mode
+ * is the best choice.
+ * The board can be powered via GPIOs, in this case port0 *can*
+ * act as a host (with a cable/adapter ignoring CC), as VBUS is
+ * then provided by the GPIOs. Any user of this setup would
+ * need to adjust the DT accordingly: dr_mode set to "host",
+ * enabling OHCI0 and EHCI0.
+ */
+ dr_mode = "peripheral";
+ status = "okay";
+};
+
+&usbphy {
+ usb1_vbus-supply = <&reg_usb1_vbus>;
+ status = "okay";
+};
diff --git a/arch/arm/dts/sun50i-h616-x96-mate.dts b/arch/arm/dts/sun50i-h616-x96-mate.dts
index 6619db34714a..07424c28b696 100644
--- a/arch/arm/dts/sun50i-h616-x96-mate.dts
+++ b/arch/arm/dts/sun50i-h616-x96-mate.dts
@@ -32,6 +32,14 @@
};
};
+&ehci0 {
+ status = "okay";
+};
+
+&ehci2 {
+ status = "okay";
+};
+
&ir {
status = "okay";
};
@@ -54,6 +62,14 @@
status = "okay";
};
+&ohci0 {
+ status = "okay";
+};
+
+&ohci2 {
+ status = "okay";
+};
+
&r_rsb {
status = "okay";
@@ -175,3 +191,12 @@
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
+
+&usbotg {
+ dr_mode = "host"; /* USB A type receptable */
+ status = "okay";
+};
+
+&usbphy {
+ status = "okay";
+};
diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi
index 622a1f7d1641..74aed0d232a9 100644
--- a/arch/arm/dts/sun50i-h616.dtsi
+++ b/arch/arm/dts/sun50i-h616.dtsi
@@ -504,6 +504,166 @@
};
};
+ usbotg: usb@5100000 {
+ compatible = "allwinner,sun50i-h616-musb",
+ "allwinner,sun8i-h3-musb";
+ reg = <0x05100000 0x0400>;
+ clocks = <&ccu CLK_BUS_OTG>;
+ resets = <&ccu RST_BUS_OTG>;
+ interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "mc";
+ phys = <&usbphy 0>;
+ phy-names = "usb";
+ extcon = <&usbphy 0>;
+ status = "disabled";
+ };
+
+ usbphy: phy@5100400 {
+ compatible = "allwinner,sun50i-h616-usb-phy";
+ reg = <0x05100400 0x24>,
+ <0x05101800 0x14>,
+ <0x05200800 0x14>,
+ <0x05310800 0x14>,
+ <0x05311800 0x14>;
+ reg-names = "phy_ctrl",
+ "pmu0",
+ "pmu1",
+ "pmu2",
+ "pmu3";
+ clocks = <&ccu CLK_USB_PHY0>,
+ <&ccu CLK_USB_PHY1>,
+ <&ccu CLK_USB_PHY2>,
+ <&ccu CLK_USB_PHY3>,
+ <&ccu CLK_BUS_EHCI2>;
+ clock-names = "usb0_phy",
+ "usb1_phy",
+ "usb2_phy",
+ "usb3_phy",
+ "pmu2_clk";
+ resets = <&ccu RST_USB_PHY0>,
+ <&ccu RST_USB_PHY1>,
+ <&ccu RST_USB_PHY2>,
+ <&ccu RST_USB_PHY3>;
+ reset-names = "usb0_reset",
+ "usb1_reset",
+ "usb2_reset",
+ "usb3_reset";
+ status = "disabled";
+ #phy-cells = <1>;
+ };
+
+ ehci0: usb@5101000 {
+ compatible = "allwinner,sun50i-h616-ehci",
+ "generic-ehci";
+ reg = <0x05101000 0x100>;
+ interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_OHCI0>,
+ <&ccu CLK_BUS_EHCI0>,
+ <&ccu CLK_USB_OHCI0>;
+ resets = <&ccu RST_BUS_OHCI0>,
+ <&ccu RST_BUS_EHCI0>;
+ phys = <&usbphy 0>;
+ phy-names = "usb";
+ status = "disabled";
+ };
+
+ ohci0: usb@5101400 {
+ compatible = "allwinner,sun50i-h616-ohci",
+ "generic-ohci";
+ reg = <0x05101400 0x100>;
+ interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_OHCI0>,
+ <&ccu CLK_USB_OHCI0>;
+ resets = <&ccu RST_BUS_OHCI0>;
+ phys = <&usbphy 0>;
+ phy-names = "usb";
+ status = "disabled";
+ };
+
+ ehci1: usb@5200000 {
+ compatible = "allwinner,sun50i-h616-ehci",
+ "generic-ehci";
+ reg = <0x05200000 0x100>;
+ interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_OHCI1>,
+ <&ccu CLK_BUS_EHCI1>,
+ <&ccu CLK_USB_OHCI1>;
+ resets = <&ccu RST_BUS_OHCI1>,
+ <&ccu RST_BUS_EHCI1>;
+ phys = <&usbphy 1>;
+ phy-names = "usb";
+ status = "disabled";
+ };
+
+ ohci1: usb@5200400 {
+ compatible = "allwinner,sun50i-h616-ohci",
+ "generic-ohci";
+ reg = <0x05200400 0x100>;
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_OHCI1>,
+ <&ccu CLK_USB_OHCI1>;
+ resets = <&ccu RST_BUS_OHCI1>;
+ phys = <&usbphy 1>;
+ phy-names = "usb";
+ status = "disabled";
+ };
+
+ ehci2: usb@5310000 {
+ compatible = "allwinner,sun50i-h616-ehci",
+ "generic-ehci";
+ reg = <0x05310000 0x100>;
+ interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_OHCI2>,
+ <&ccu CLK_BUS_EHCI2>,
+ <&ccu CLK_USB_OHCI2>;
+ resets = <&ccu RST_BUS_OHCI2>,
+ <&ccu RST_BUS_EHCI2>;
+ phys = <&usbphy 2>;
+ phy-names = "usb";
+ status = "disabled";
+ };
+
+ ohci2: usb@5310400 {
+ compatible = "allwinner,sun50i-h616-ohci",
+ "generic-ohci";
+ reg = <0x05310400 0x100>;
+ interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_OHCI2>,
+ <&ccu CLK_USB_OHCI2>;
+ resets = <&ccu RST_BUS_OHCI2>;
+ phys = <&usbphy 2>;
+ phy-names = "usb";
+ status = "disabled";
+ };
+
+ ehci3: usb@5311000 {
+ compatible = "allwinner,sun50i-h616-ehci",
+ "generic-ehci";
+ reg = <0x05311000 0x100>;
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_OHCI3>,
+ <&ccu CLK_BUS_EHCI3>,
+ <&ccu CLK_USB_OHCI3>;
+ resets = <&ccu RST_BUS_OHCI3>,
+ <&ccu RST_BUS_EHCI3>;
+ phys = <&usbphy 3>;
+ phy-names = "usb";
+ status = "disabled";
+ };
+
+ ohci3: usb@5311400 {
+ compatible = "allwinner,sun50i-h616-ohci",
+ "generic-ohci";
+ reg = <0x05311400 0x100>;
+ interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_OHCI3>,
+ <&ccu CLK_USB_OHCI3>;
+ resets = <&ccu RST_BUS_OHCI3>;
+ phys = <&usbphy 3>;
+ phy-names = "usb";
+ status = "disabled";
+ };
+
rtc: rtc@7000000 {
compatible = "allwinner,sun50i-h616-rtc";
reg = <0x07000000 0x400>;