diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0001-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0001-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch index a1e3ecede..5ffa69096 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0001-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch +++ b/patch/u-boot/legacy/u-boot-meko-rk3588/0001-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch @@ -9,7 +9,7 @@ Subject: use serial# as base for MAC address; find serial# first, then 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c -index 1d0ae1bbe0c..75bd0adc8f8 100644 +index 1d0ae1bbe0ca..75bd0adc8f8f 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -109,15 +109,55 @@ static int rockchip_set_ethaddr(void) diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch index aab171459..c2d034aa4 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch +++ b/patch/u-boot/legacy/u-boot-meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch @@ -9,7 +9,7 @@ Signed-off-by: Stephen 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/source.c b/cmd/source.c -index 6b1c8b744b4..cf820c072af 100644 +index 6b1c8b744b49..cf820c072af1 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -87,7 +87,7 @@ source (ulong addr, const char *fit_uname) diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch index 809fcf205..899218a9d 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch +++ b/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch @@ -10,7 +10,7 @@ Subject: rk3588_meko_defconfig - evb sans optee (original-ish by Meko from diff --git a/configs/rk3588_meko_defconfig b/configs/rk3588_meko_defconfig new file mode 100644 -index 00000000000..73104bb182d +index 000000000000..73104bb182de --- /dev/null +++ b/configs/rk3588_meko_defconfig @@ -0,0 +1,238 @@ diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch index cf5402496..5e7ed771c 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch +++ b/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch @@ -13,7 +13,7 @@ Subject: rk3588_meko_r58x_defconfig and dts with pci3x4 nvme boot and working diff --git a/arch/arm/dts/rk3588-blueberry-edge-v12.dts b/arch/arm/dts/rk3588-blueberry-edge-v12.dts new file mode 100644 -index 00000000000..5dd31189e3d +index 000000000000..5dd31189e3d4 --- /dev/null +++ b/arch/arm/dts/rk3588-blueberry-edge-v12.dts @@ -0,0 +1,159 @@ @@ -178,7 +178,7 @@ index 00000000000..5dd31189e3d + diff --git a/configs/rk3588_meko_r58x_defconfig b/configs/rk3588_meko_r58x_defconfig new file mode 100644 -index 00000000000..b03ffa9437c +index 000000000000..b03ffa9437c7 --- /dev/null +++ b/configs/rk3588_meko_r58x_defconfig @@ -0,0 +1,248 @@ diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch index 800e7f325..3a58715b8 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch +++ b/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch @@ -10,7 +10,7 @@ Subject: boot_rkimg: don't try rockchip_u2phy_vbus_detect when RECOVERY button 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rockchip/boot_rkimg.c b/arch/arm/mach-rockchip/boot_rkimg.c -index 9e6c3556a9e..f79aed467bc 100644 +index 9e6c3556a9e2..f79aed467bc1 100644 --- a/arch/arm/mach-rockchip/boot_rkimg.c +++ b/arch/arm/mach-rockchip/boot_rkimg.c @@ -322,14 +322,17 @@ void setup_download_mode(void) diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0001-Add-Blade-3-defines.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0001-Add-Blade-3-defines.patch index e7f485d3c..15f9609eb 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0001-Add-Blade-3-defines.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0001-Add-Blade-3-defines.patch @@ -10,7 +10,7 @@ Subject: Add Blade 3 defines diff --git a/arch/arm/dts/rk3588-blade3.dts b/arch/arm/dts/rk3588-blade3.dts new file mode 100644 -index 00000000000..d46226011c0 +index 000000000000..d46226011c0f --- /dev/null +++ b/arch/arm/dts/rk3588-blade3.dts @@ -0,0 +1,50 @@ @@ -66,7 +66,7 @@ index 00000000000..d46226011c0 +}; diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig new file mode 100644 -index 00000000000..092677e7fcd +index 000000000000..092677e7fcd8 --- /dev/null +++ b/configs/blade3_defconfig @@ -0,0 +1,225 @@ diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch index f84c92d57..48ec95964 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch @@ -10,7 +10,7 @@ Subject: Fixed restart issues with pd adapter. 3 files changed, 140 insertions(+), 76 deletions(-) diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c -index 1d0ae1bbe0c..e60153dde87 100644 +index 1d0ae1bbe0ca..e60153dde872 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -414,8 +414,17 @@ static void cmdline_handle(void) @@ -32,7 +32,7 @@ index 1d0ae1bbe0c..e60153dde87 100644 rockchip_set_ethaddr(); #endif diff --git a/drivers/power/power_delivery/fusb302.c b/drivers/power/power_delivery/fusb302.c -index 395455d06bd..cf64df4ca4f 100644 +index 395455d06bd3..cf64df4ca4f4 100644 --- a/drivers/power/power_delivery/fusb302.c +++ b/drivers/power/power_delivery/fusb302.c @@ -11,7 +11,7 @@ @@ -281,7 +281,7 @@ index 395455d06bd..cf64df4ca4f 100644 { struct fusb302_chip *chip = dev_get_priv(dev); diff --git a/drivers/power/power_delivery/tcpm.c b/drivers/power/power_delivery/tcpm.c -index 22334c6230c..6b628bafa26 100644 +index 22334c6230c4..6b628bafa26c 100644 --- a/drivers/power/power_delivery/tcpm.c +++ b/drivers/power/power_delivery/tcpm.c @@ -165,7 +165,7 @@ diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch index 820c69fae..34e039c55 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch @@ -8,7 +8,7 @@ Subject: fix power_delivery driver affects adb to enter loader mode. 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c -index e60153dde87..9b2450ec901 100644 +index e60153dde872..9b2450ec9010 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -424,7 +424,14 @@ static void power_delivery_func(void) diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch index 7c1997df9..aee2db42c 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch @@ -8,7 +8,7 @@ Subject: cmd: source: fix the error that the command source failed to execute 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/source.c b/cmd/source.c -index 6b1c8b744b4..cf820c072af 100644 +index 6b1c8b744b49..cf820c072af1 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -87,7 +87,7 @@ source (ulong addr, const char *fit_uname) diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0005-add-device-tree-with-sata-support.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0005-add-device-tree-with-sata-support.patch index a5c4fe492..870655104 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0005-add-device-tree-with-sata-support.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0005-add-device-tree-with-sata-support.patch @@ -10,7 +10,7 @@ Subject: add device tree with sata support diff --git a/arch/arm/dts/rk3588-blade3-sata.dts b/arch/arm/dts/rk3588-blade3-sata.dts new file mode 100644 -index 00000000000..e3eec13f1e2 +index 000000000000..e3eec13f1e2f --- /dev/null +++ b/arch/arm/dts/rk3588-blade3-sata.dts @@ -0,0 +1,27 @@ @@ -43,7 +43,7 @@ index 00000000000..e3eec13f1e2 +}; diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig new file mode 100644 -index 00000000000..0f68086a653 +index 000000000000..0f68086a6532 --- /dev/null +++ b/configs/blade3_sata_defconfig @@ -0,0 +1,225 @@ diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0006-disable-optee-in-defconfig.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0006-disable-optee-in-defconfig.patch index 0544931a9..56326f6c5 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0006-disable-optee-in-defconfig.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0006-disable-optee-in-defconfig.patch @@ -10,7 +10,7 @@ Signed-off-by: Ricardo Pardini 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig -index 092677e7fcd..67408deca85 100644 +index 092677e7fcd8..67408deca855 100644 --- a/configs/blade3_defconfig +++ b/configs/blade3_defconfig @@ -200,8 +200,8 @@ CONFIG_DISPLAY=y @@ -31,7 +31,7 @@ index 092677e7fcd..67408deca85 100644 -CONFIG_OPTEE_V2=y -CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig -index 0f68086a653..f517434650c 100644 +index 0f68086a6532..f517434650c7 100644 --- a/configs/blade3_sata_defconfig +++ b/configs/blade3_sata_defconfig @@ -200,8 +200,8 @@ CONFIG_DISPLAY=y diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0007-mixtile-blade3-enable-OTP-in-defconfig.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0007-mixtile-blade3-enable-OTP-in-defconfig.patch index 23ce40a42..f1e3cd6e1 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0007-mixtile-blade3-enable-OTP-in-defconfig.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0007-mixtile-blade3-enable-OTP-in-defconfig.patch @@ -9,7 +9,7 @@ Subject: mixtile-blade3: enable OTP in defconfig 2 files changed, 2 insertions(+) diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig -index 67408deca85..d0bb2907f06 100644 +index 67408deca855..d0bb2907f063 100644 --- a/configs/blade3_defconfig +++ b/configs/blade3_defconfig @@ -220,3 +220,4 @@ CONFIG_AVB_LIBAVB_AB=y @@ -18,7 +18,7 @@ index 67408deca85..d0bb2907f06 100644 CONFIG_RK_AVB_LIBAVB_USER=y +CONFIG_ROCKCHIP_OTP=y diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig -index f517434650c..ea632e1512a 100644 +index f517434650c7..ea632e1512a2 100644 --- a/configs/blade3_sata_defconfig +++ b/configs/blade3_sata_defconfig @@ -220,3 +220,4 @@ CONFIG_AVB_LIBAVB_AB=y diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0008-enable-nvme-pci-and-scsi-in-the-defconfig.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0008-enable-nvme-pci-and-scsi-in-the-defconfig.patch index d0b028211..bc4af8859 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0008-enable-nvme-pci-and-scsi-in-the-defconfig.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0008-enable-nvme-pci-and-scsi-in-the-defconfig.patch @@ -9,7 +9,7 @@ Subject: enable nvme, pci, and scsi in the defconfig 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig -index d0bb2907f06..0ed3a08d853 100644 +index d0bb2907f063..0ed3a08d853e 100644 --- a/configs/blade3_defconfig +++ b/configs/blade3_defconfig @@ -29,7 +29,7 @@ CONFIG_SPL_LOAD_FIT=y @@ -49,7 +49,7 @@ index d0bb2907f06..0ed3a08d853 100644 +CONFIG_SCSI_AHCI=y +CONFIG_SCSI=y diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig -index ea632e1512a..b62ff90d651 100644 +index ea632e1512a2..b62ff90d651b 100644 --- a/configs/blade3_sata_defconfig +++ b/configs/blade3_sata_defconfig @@ -29,7 +29,7 @@ CONFIG_SPL_LOAD_FIT=y diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch index 624d7c7b0..4d322a27c 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch @@ -9,7 +9,7 @@ Subject: use serial# as base for MAC address; find serial# first, then 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c -index 9b2450ec901..408e9eadf46 100644 +index 9b2450ec9010..408e9eadf46c 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -109,15 +109,55 @@ static int rockchip_set_ethaddr(void) diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0010-blade3-enable-pcie3x4.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0010-blade3-enable-pcie3x4.patch index 84b38a326..b02adab17 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0010-blade3-enable-pcie3x4.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0010-blade3-enable-pcie3x4.patch @@ -9,7 +9,7 @@ Subject: blade3: enable pcie3x4 2 files changed, 95 insertions(+), 20 deletions(-) diff --git a/arch/arm/dts/rk3588-blade3.dts b/arch/arm/dts/rk3588-blade3.dts -index d46226011c0..ba0e7306406 100644 +index d46226011c0f..ba0e7306406b 100644 --- a/arch/arm/dts/rk3588-blade3.dts +++ b/arch/arm/dts/rk3588-blade3.dts @@ -5,7 +5,6 @@ @@ -114,7 +114,7 @@ index d46226011c0..ba0e7306406 100644 }; + diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig -index 0ed3a08d853..07dde02b427 100644 +index 0ed3a08d853e..07dde02b4276 100644 --- a/configs/blade3_defconfig +++ b/configs/blade3_defconfig @@ -6,14 +6,14 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0011-arch-arm-mach-rockchip-fix-srctree-path.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0011-arch-arm-mach-rockchip-fix-srctree-path.patch index e1df37dcc..a83d54923 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0011-arch-arm-mach-rockchip-fix-srctree-path.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0011-arch-arm-mach-rockchip-fix-srctree-path.patch @@ -9,7 +9,7 @@ Subject: arch: arm: mach-rockchip: fix srctree path 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/fit_nodes.sh b/arch/arm/mach-rockchip/fit_nodes.sh -index be7d46d8f71..c0afc1ade31 100755 +index be7d46d8f71c..c0afc1ade315 100755 --- a/arch/arm/mach-rockchip/fit_nodes.sh +++ b/arch/arm/mach-rockchip/fit_nodes.sh @@ -6,7 +6,7 @@ @@ -22,7 +22,7 @@ index be7d46d8f71..c0afc1ade31 100755 # Periph register diff --git a/arch/arm/mach-rockchip/make_fit_atf.sh b/arch/arm/mach-rockchip/make_fit_atf.sh -index 045273e3bd0..fa6a9780ed0 100755 +index 045273e3bd08..fa6a9780ed0c 100755 --- a/arch/arm/mach-rockchip/make_fit_atf.sh +++ b/arch/arm/mach-rockchip/make_fit_atf.sh @@ -5,7 +5,7 @@ diff --git a/patch/u-boot/legacy/u-boot-tinkerboard2/add-board-tinker-board-2.patch b/patch/u-boot/legacy/u-boot-tinkerboard2/add-board-tinker-board-2.patch index 911312bd5..452238ee0 100644 --- a/patch/u-boot/legacy/u-boot-tinkerboard2/add-board-tinker-board-2.patch +++ b/patch/u-boot/legacy/u-boot-tinkerboard2/add-board-tinker-board-2.patch @@ -1,46 +1,39 @@ -From 967e0da33c720f06e59473680e2ba08eb9fa769d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: tonymac32 Date: Tue, 2 Mar 2021 15:49:01 -0500 -Subject: [PATCH] Patching something +Subject: Add board Tinkerboard-2 uboot with regulator Signed-off-by: tonymac32 --- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/rk3399-tinker-2-u-boot.dtsi | 60 ++ - arch/arm/dts/rk3399-tinker-2.dts | 511 ++++++++++++++++++ - arch/arm/mach-rockchip/rk3399/Kconfig | 8 +- - board/rockchip/tinker-2_rk3399/Kconfig | 15 + - board/rockchip/tinker-2_rk3399/Makefile | 7 + - .../tinker-2_rk3399/tinker-2-rk3399.c | 56 ++ - configs/tinker-2-rk3399_defconfig | 79 +++ - drivers/power/pmic/fan53555.c | 1 + - drivers/power/regulator/fan53555.c | 2 + - include/configs/tinker-2_rk3399.h | 22 + - include/power/fan53555.h | 1 + - 14 files changed, 767 insertions(+), 3 deletions(-) - create mode 100644 arch/arm/dts/rk3399-tinker-2-u-boot.dtsi - create mode 100644 arch/arm/dts/rk3399-tinker-2.dts - create mode 100644 board/rockchip/tinker-2_rk3399/Kconfig - create mode 100644 board/rockchip/tinker-2_rk3399/Makefile - create mode 100644 board/rockchip/tinker-2_rk3399/tinker-2-rk3399.c - create mode 100644 configs/tinker-2-rk3399_defconfig - create mode 100644 include/configs/tinker-2_rk3399.h + arch/arm/dts/Makefile | 1 + + arch/arm/dts/rk3399-tinker-2-u-boot.dtsi | 60 ++ + arch/arm/dts/rk3399-tinker-2.dts | 511 ++++++++++ + arch/arm/mach-rockchip/rk3399/Kconfig | 6 + + board/rockchip/tinker-2_rk3399/Kconfig | 15 + + board/rockchip/tinker-2_rk3399/Makefile | 7 + + board/rockchip/tinker-2_rk3399/tinker-2-rk3399.c | 56 + + configs/tinker-2-rk3399_defconfig | 81 ++ + drivers/power/pmic/fan53555.c | 1 + + drivers/power/regulator/fan53555.c | 2 + + include/configs/tinker-2_rk3399.h | 22 + + include/power/fan53555.h | 1 + + 12 files changed, 763 insertions(+) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 06ccc03e..2919b8b2 100644 +index 9fb38682e61c..cf593b8c3d20 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -145,6 +145,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ +@@ -144,6 +144,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-rock-pi-4c.dtb \ rk3399-rock960.dtb \ rk3399-rockpro64.dtb \ + rk3399-tinker-2.dtb \ rk3399pro-rock-pi-n10.dtb - + dtb-$(CONFIG_ROCKCHIP_RV1108) += \ diff --git a/arch/arm/dts/rk3399-tinker-2-u-boot.dtsi b/arch/arm/dts/rk3399-tinker-2-u-boot.dtsi new file mode 100644 -index 00000000..02a8f9f5 +index 000000000000..875b8ab61f06 --- /dev/null +++ b/arch/arm/dts/rk3399-tinker-2-u-boot.dtsi @@ -0,0 +1,60 @@ @@ -106,7 +99,7 @@ index 00000000..02a8f9f5 +}; diff --git a/arch/arm/dts/rk3399-tinker-2.dts b/arch/arm/dts/rk3399-tinker-2.dts new file mode 100644 -index 00000000..7372f25a +index 000000000000..2fccc50eb2f7 --- /dev/null +++ b/arch/arm/dts/rk3399-tinker-2.dts @@ -0,0 +1,511 @@ @@ -622,15 +615,13 @@ index 00000000..7372f25a + status = "okay"; +}; diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig -index 7890bafe..8215116e 100644 +index 17628f917127..2753712b9ada 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig -@@ -105,7 +105,12 @@ config TARGET_ROCKPRO64_RK3399 - * USB Type C power and data +@@ -90,6 +90,11 @@ config TARGET_ROCKPRO64_RK3399 * GPIO expansion ports * DC 12V/2A -- -+ + +config TARGET_TINKER2_RK3399 + bool "Asus Tinker Board 2" + help @@ -639,16 +630,16 @@ index 7890bafe..8215116e 100644 config TARGET_ROC_PC_RK3399 bool "Firefly ROC-RK3399-PC board" help -@@ -175,5 +180,6 @@ source "board/pine64/rockpro64_rk3399/Kconfig" +@@ -158,5 +163,6 @@ source "board/pine64/rockpro64_rk3399/Kconfig" source "board/rockchip/evb_rk3399/Kconfig" source "board/theobroma-systems/puma_rk3399/Kconfig" source "board/vamrs/rock960_rk3399/Kconfig" +source "board/rockchip/tinker-2_rk3399/Kconfig" - + endif diff --git a/board/rockchip/tinker-2_rk3399/Kconfig b/board/rockchip/tinker-2_rk3399/Kconfig new file mode 100644 -index 00000000..ce5d8b18 +index 000000000000..bc50769a13a8 --- /dev/null +++ b/board/rockchip/tinker-2_rk3399/Kconfig @@ -0,0 +1,15 @@ @@ -669,7 +660,7 @@ index 00000000..ce5d8b18 +endif diff --git a/board/rockchip/tinker-2_rk3399/Makefile b/board/rockchip/tinker-2_rk3399/Makefile new file mode 100644 -index 00000000..21218f2a +index 000000000000..21218f2a64d6 --- /dev/null +++ b/board/rockchip/tinker-2_rk3399/Makefile @@ -0,0 +1,7 @@ @@ -682,7 +673,7 @@ index 00000000..21218f2a +obj-y += tinker-2-rk3399.o diff --git a/board/rockchip/tinker-2_rk3399/tinker-2-rk3399.c b/board/rockchip/tinker-2_rk3399/tinker-2-rk3399.c new file mode 100644 -index 00000000..d7908461 +index 000000000000..d79084614f1f --- /dev/null +++ b/board/rockchip/tinker-2_rk3399/tinker-2-rk3399.c @@ -0,0 +1,56 @@ @@ -744,7 +735,7 @@ index 00000000..d7908461 +#endif diff --git a/configs/tinker-2-rk3399_defconfig b/configs/tinker-2-rk3399_defconfig new file mode 100644 -index 00000000..de9c2692 +index 000000000000..bd03fc6d8531 --- /dev/null +++ b/configs/tinker-2-rk3399_defconfig @@ -0,0 +1,81 @@ @@ -830,11 +821,11 @@ index 00000000..de9c2692 +CONFIG_SPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y diff --git a/drivers/power/pmic/fan53555.c b/drivers/power/pmic/fan53555.c -index 4d1e686d..8fba05ff 100644 +index 4d1e686d274a..8fba05ff9594 100644 --- a/drivers/power/pmic/fan53555.c +++ b/drivers/power/pmic/fan53555.c @@ -73,6 +73,7 @@ static struct dm_pmic_ops pmic_fan53555_ops = { - + static const struct udevice_id pmic_fan53555_match[] = { { .compatible = "fcs,fan53555", .data = FAN53555_VENDOR_FAIRCHILD, }, + { .compatible = "fcs,fan53200", .data = FAN53200_VENDOR_FAIRCHILD, }, @@ -842,7 +833,7 @@ index 4d1e686d..8fba05ff 100644 { .compatible = "silergy,syr828", .data = FAN53555_VENDOR_SILERGY, }, { }, diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c -index b407f555..89ba851f 100644 +index 9d8a235b79b7..8013579c3422 100644 --- a/drivers/power/regulator/fan53555.c +++ b/drivers/power/regulator/fan53555.c @@ -55,6 +55,8 @@ static const struct { @@ -856,7 +847,7 @@ index b407f555..89ba851f 100644 /* SYL82X */ diff --git a/include/configs/tinker-2_rk3399.h b/include/configs/tinker-2_rk3399.h new file mode 100644 -index 00000000..36315602 +index 000000000000..363156026650 --- /dev/null +++ b/include/configs/tinker-2_rk3399.h @@ -0,0 +1,22 @@ @@ -883,17 +874,17 @@ index 00000000..36315602 + +#endif diff --git a/include/power/fan53555.h b/include/power/fan53555.h -index c039f060..8a50593c 100644 +index c039f06071d7..8a50593cf147 100644 --- a/include/power/fan53555.h +++ b/include/power/fan53555.h @@ -7,6 +7,7 @@ #define _FAN53555_H_ - + enum fan53555_vendor { + FAN53200_VENDOR_FAIRCHILD, FAN53555_VENDOR_FAIRCHILD, FAN53555_VENDOR_SILERGY, }; --- -Created with Armbian build tools https://github.com/armbian/build +-- +Armbian diff --git a/patch/u-boot/legacy/u-boot-tinkerboard2/add-trust-ini.patch b/patch/u-boot/legacy/u-boot-tinkerboard2/add-trust-ini.patch index 793f34dd1..0bf5e3f03 100644 --- a/patch/u-boot/legacy/u-boot-tinkerboard2/add-trust-ini.patch +++ b/patch/u-boot/legacy/u-boot-tinkerboard2/add-trust-ini.patch @@ -1,6 +1,15 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: zador-blood-stained +Date: Wed, 16 Aug 2017 20:17:57 +0300 +Subject: Add trust.ini + +--- + trust.ini | 15 ++++++++++ + 1 file changed, 15 insertions(+) + diff --git a/trust.ini b/trust.ini new file mode 100644 -index 0000000..4af021a +index 000000000000..8cd7b97683f0 --- /dev/null +++ b/trust.ini @@ -0,0 +1,15 @@ @@ -19,3 +28,6 @@ index 0000000..4af021a +SEC=0 +[OUTPUT] +PATH=trust.bin +-- +Armbian + diff --git a/patch/u-boot/legacy/u-boot-tinkerboard2/enable-DT-overlays-support.patch b/patch/u-boot/legacy/u-boot-tinkerboard2/enable-DT-overlays-support.patch index 3794a05c9..75407b295 100644 --- a/patch/u-boot/legacy/u-boot-tinkerboard2/enable-DT-overlays-support.patch +++ b/patch/u-boot/legacy/u-boot-tinkerboard2/enable-DT-overlays-support.patch @@ -1,13 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: zador-blood-stained +Date: Thu, 17 Aug 2017 20:13:41 +0300 +Subject: Enable DT overlay support in u-boot + +--- + arch/arm/Kconfig | 2 ++ + 1 file changed, 2 insertions(+) + diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 1f3fa15..f559fa4 100644 +index 0448787b8bc4..6883ca8e4837 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1358,6 +1358,8 @@ config ARCH_ROCKCHIP +@@ -1777,6 +1777,8 @@ config ARCH_ROCKCHIP imply SYS_NS16550 imply TPL_SYSRESET imply USB_FUNCTION_FASTBOOT + select OF_LIBFDT + select OF_LIBFDT_OVERLAY - config TARGET_THUNDERX_88XX - bool "Support ThunderX 88xx" + config ARCH_OCTEONTX + bool "Support OcteonTX SoCs" +-- +Armbian + diff --git a/patch/u-boot/u-boot-qemu-x86/0001-hack-higher-ramdisk-load-address-both-in-u-boot-source-and-bootscript.patch b/patch/u-boot/u-boot-qemu-x86/0001-hack-higher-ramdisk-load-address-both-in-u-boot-source-and-bootscript.patch index e15364a2a..294cf88b7 100644 --- a/patch/u-boot/u-boot-qemu-x86/0001-hack-higher-ramdisk-load-address-both-in-u-boot-source-and-bootscript.patch +++ b/patch/u-boot/u-boot-qemu-x86/0001-hack-higher-ramdisk-load-address-both-in-u-boot-source-and-bootscript.patch @@ -9,7 +9,7 @@ Subject: hack: higher ramdisk load address both in u-boot source and 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h -index 8bd0716c08d..f1907792d33 100644 +index 8bd0716c08d2..f1907792d338 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -13,7 +13,7 @@ diff --git a/patch/u-boot/u-boot-qemu-x86/0002-x86-patch-uboot-defconfig-to-use-the-q35-machine-type-not-i440fx.patch b/patch/u-boot/u-boot-qemu-x86/0002-x86-patch-uboot-defconfig-to-use-the-q35-machine-type-not-i440fx.patch index bf4fd0e6b..c142b8ea0 100644 --- a/patch/u-boot/u-boot-qemu-x86/0002-x86-patch-uboot-defconfig-to-use-the-q35-machine-type-not-i440fx.patch +++ b/patch/u-boot/u-boot-qemu-x86/0002-x86-patch-uboot-defconfig-to-use-the-q35-machine-type-not-i440fx.patch @@ -9,7 +9,7 @@ Subject: x86: patch uboot defconfig to use the `q35` machine type, not 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig -index 24682a5387d..efdf520d813 100644 +index 24682a5387df..efdf520d813f 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x1000 diff --git a/patch/u-boot/u-boot-qemu-x86/0003-hack-bump-bzimage-max-size-to-45mb-from-15mb.patch b/patch/u-boot/u-boot-qemu-x86/0003-hack-bump-bzimage-max-size-to-45mb-from-15mb.patch index 717c72a3e..8f0da850d 100644 --- a/patch/u-boot/u-boot-qemu-x86/0003-hack-bump-bzimage-max-size-to-45mb-from-15mb.patch +++ b/patch/u-boot/u-boot-qemu-x86/0003-hack-bump-bzimage-max-size-to-45mb-from-15mb.patch @@ -8,7 +8,7 @@ Subject: hack: bump bzimage max size to 45mb from 15mb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h -index 9ad74dc0b94..e1f057df380 100644 +index 9ad74dc0b946..e1f057df3806 100644 --- a/arch/x86/include/asm/zimage.h +++ b/arch/x86/include/asm/zimage.h @@ -22,7 +22,7 @@ diff --git a/patch/u-boot/v2022.07/board_radxa-zero/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch b/patch/u-boot/v2022.07/board_radxa-zero/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch deleted file mode 100644 index a0bdf25a1..000000000 --- a/patch/u-boot/v2022.07/board_radxa-zero/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ff82d04354784cd982ab1a912c08d3eb22f82d13 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Neil Armstrong -Date: Mon, 2 Sep 2019 15:42:04 +0200 -Subject: [PATCH] HACK: mmc: meson-gx: limit to 24MHz - -Signed-off-by: Neil Armstrong ---- - drivers/mmc/meson_gx_mmc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c -index fcf4f03d1e..6ded4b619b 100644 ---- a/drivers/mmc/meson_gx_mmc.c -+++ b/drivers/mmc/meson_gx_mmc.c -@@ -279,7 +279,7 @@ static int meson_mmc_probe(struct udevice *dev) - cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT | - MMC_MODE_HS_52MHz | MMC_MODE_HS; - cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV); -- cfg->f_max = 100000000; /* 100 MHz */ -+ cfg->f_max = SD_EMMC_CLKSRC_24M; - cfg->b_max = 511; /* max 512 - 1 blocks */ - cfg->name = dev->name; - --- -2.33.0 - diff --git a/patch/u-boot/v2022.07/board_radxa-zero2/0001-ARM-dts-add-support-for-Radxa-Zero-2.patch b/patch/u-boot/v2022.07/board_radxa-zero2/0001-ARM-dts-add-support-for-Radxa-Zero-2.patch deleted file mode 100644 index aa8190a5a..000000000 --- a/patch/u-boot/v2022.07/board_radxa-zero2/0001-ARM-dts-add-support-for-Radxa-Zero-2.patch +++ /dev/null @@ -1,655 +0,0 @@ -From 1df0b2a2f182348ee440aea62c4d9b5776d4e1c7 Mon Sep 17 00:00:00 2001 -From: Yuntian Zhang -Date: Fri, 14 Jan 2022 19:16:39 +0800 -Subject: [PATCH 1/2] boards: amlogic: add Radxa Zero 2 defconfig - -Add a defconfig for the Radxa Zero 2 SBC, using Amlogic A311D SoC. -This file is created manuall based on radxa-zero_defconfig and -khadas-vim3_defconfig. - -Signed-off-by: Yuntian Zhang - -From 28e43804e0f3ff399efc9b42ad5dbdf641923c1b Mon Sep 17 00:00:00 2001 -From: Yuntian Zhang -Date: Mon, 17 Jan 2022 14:11:14 +0800 -Subject: [PATCH 2/2] ARM: dts: add support for Radxa Zero 2 - -Import the initial dts from RadxaYuntian/kernel/zero2-bringup repo. - -Signed-off-by: Yuntian Zhang ---- - configs/radxa-zero2_defconfig | 94 +++++++++++++++++++++++++++++++++++ - arch/arm/dts/Makefile | 1 + - .../dts/meson-g12b-radxa-zero2-u-boot.dtsi | 7 + - arch/arm/dts/meson-g12b-radxa-zero2.dts | 492 ++++++++++++++++++ - 4 files changed, 594 insertions(+) - create mode 100644 configs/radxa-zero2_defconfig - create mode 100644 arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi - create mode 100644 arch/arm/dts/meson-g12b-radxa-zero2.dts - -diff --git a/configs/radxa-zero2_defconfig b/configs/radxa-zero2_defconfig -new file mode 100644 -index 0000000000..b4cbc5c37d ---- /dev/null -+++ b/configs/radxa-zero2_defconfig -@@ -0,0 +1,94 @@ -+CONFIG_ARM=y -+# CONFIG_SYS_BOARD is not set -+CONFIG_ARCH_MESON=y -+CONFIG_SYS_TEXT_BASE=0x01000000 -+CONFIG_SYS_LOAD_ADDR=0x1000000 -+CONFIG_NR_DRAM_BANKS=1 -+CONFIG_ENV_SIZE=0x2000 -+CONFIG_DM_GPIO=y -+CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-radxa-zero2" -+CONFIG_MESON_G12A=y -+CONFIG_DEBUG_UART_BASE=0xff803000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_IDENT_STRING=" radxa-zero2" -+CONFIG_DEBUG_UART=y -+CONFIG_OF_BOARD_SETUP=y -+# CONFIG_DISPLAY_CPUINFO is not set -+CONFIG_MISC_INIT_R=y -+# CONFIG_CMD_BDI is not set -+# CONFIG_CMD_IMI is not set -+CONFIG_CMD_GPIO=y -+# CONFIG_CMD_I2C is not set -+# CONFIG_CMD_LOADS is not set -+CONFIG_CMD_MMC=y -+# CONFIG_CMD_PCI is not set -+# CONFIG_CMD_SF_TEST is not set -+# CONFIG_CMD_SPI is not set -+CONFIG_CMD_USB=y -+CONFIG_CMD_USB_MASS_STORAGE=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_REGULATOR=y -+CONFIG_OF_CONTROL=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+# CONFIG_NET_RANDOM_ETHADDR is not set -+# CONFIG_ADC is not set -+# CONFIG_SARADC_MESON is not set -+# CONFIG_BUTTON is not set -+# CONFIG_BUTTON_ADC is not set -+# CONFIG_DM_I2C is not set -+# CONFIG_SYS_I2C_MESON is not set -+CONFIG_MMC_MESON_GX=y -+CONFIG_MTD=y -+CONFIG_DM_MTD=y -+# CONFIG_DM_SPI_FLASH is not set -+# CONFIG_SPI_FLASH_WINBOND is not set -+# CONFIG_PHY_REALTEK is not set -+# CONFIG_DM_ETH is not set -+CONFIG_DM_MDIO=y -+CONFIG_DM_MDIO_MUX=y -+# CONFIG_ETH_DESIGNWARE_MESON8B is not set -+CONFIG_MDIO_MUX_MESON_G12A=y -+# CONFIG_NVME is not set -+# CONFIG_PCI is not set -+# CONFIG_PCIE_DW_MESON is not set -+CONFIG_MESON_G12A_USB_PHY=y -+CONFIG_PINCTRL=y -+CONFIG_PINCTRL_MESON_G12A=y -+CONFIG_POWER_DOMAIN=y -+CONFIG_MESON_EE_POWER_DOMAIN=y -+CONFIG_DM_REGULATOR=y -+CONFIG_DM_REGULATOR_FIXED=y -+CONFIG_DM_RESET=y -+CONFIG_DEBUG_UART_ANNOUNCE=y -+CONFIG_DEBUG_UART_SKIP_INIT=y -+CONFIG_MESON_SERIAL=y -+# CONFIG_SPI is not set -+# CONFIG_DM_SPI is not set -+# CONFIG_MESON_SPIFC is not set -+CONFIG_USB=y -+CONFIG_DM_USB=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_DWC3=y -+CONFIG_USB_DWC3=y -+# CONFIG_USB_DWC3_GADGET is not set -+CONFIG_USB_DWC3_MESON_G12A=y -+CONFIG_USB_KEYBOARD=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e -+CONFIG_USB_GADGET_PRODUCT_NUM=0xfada -+CONFIG_USB_GADGET_DWC2_OTG=y -+CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y -+CONFIG_USB_GADGET_DOWNLOAD=y -+CONFIG_DM_VIDEO=y -+# CONFIG_VIDEO_BPP8 is not set -+# CONFIG_VIDEO_BPP16 is not set -+CONFIG_SYS_WHITE_ON_BLACK=y -+CONFIG_VIDEO_MESON=y -+CONFIG_VIDEO_DT_SIMPLEFB=y -+CONFIG_SPLASH_SCREEN=y -+CONFIG_SPLASH_SCREEN_ALIGN=y -+# CONFIG_VIDEO_BMP_RLE8 is not set -+# CONFIG_BMP_16BPP is not set -+# CONFIG_BMP_24BPP is not set -+# CONFIG_BMP_32BPP is not set -+CONFIG_OF_LIBFDT_OVERLAY=y -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index c752d2bd18b..44241fafee4 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -194,6 +194,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ - meson-g12b-gsking-x.dtb \ - meson-g12b-odroid-n2.dtb \ - meson-g12b-odroid-n2-plus.dtb \ -+ meson-g12b-radxa-zero2.dtb \ - meson-sm1-bananapi-m5.dtb \ - meson-sm1-khadas-vim3l.dtb \ - meson-sm1-odroid-c4.dtb \ -diff --git a/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi b/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi -new file mode 100644 -index 0000000000..236f2468dc ---- /dev/null -+++ b/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi -@@ -0,0 +1,7 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2019 BayLibre, SAS. -+ * Author: Neil Armstrong -+ */ -+ -+#include "meson-g12-common-u-boot.dtsi" -diff --git a/arch/arm/dts/meson-g12b-radxa-zero2.dts b/arch/arm/dts/meson-g12b-radxa-zero2.dts -new file mode 100644 -index 0000000000..be7a1685da ---- /dev/null -+++ b/arch/arm/dts/meson-g12b-radxa-zero2.dts -@@ -0,0 +1,492 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2019 BayLibre, SAS -+ * Author: Neil Armstrong -+ * Copyright (c) 2019 Christian Hewitt -+ * Copyright (c) 2022 Radxa Limited -+ * Author: Yuntian Zhang -+ */ -+ -+/dts-v1/; -+ -+#include "meson-g12b-a311d.dtsi" -+#include -+#include -+#include -+#include -+ -+/ { -+ compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b"; -+ model = "Radxa Zero2"; -+ -+ aliases { -+ serial0 = &uart_AO; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x0 0x0 0x80000000>; -+ }; -+ -+ gpio-keys-polled { -+ compatible = "gpio-keys-polled"; -+ poll-interval = <100>; -+ power-button { -+ label = "power"; -+ linux,code = ; -+ gpios = <&gpio_ao GPIOAO_3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ led-green { -+ color = ; -+ function = LED_FUNCTION_STATUS; -+ gpios = <&gpio GPIOA_12 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ -+ cvbs-connector { -+ status = "disabled"; -+ compatible = "composite-video-connector"; -+ -+ port { -+ cvbs_connector_in: endpoint { -+ remote-endpoint = <&cvbs_vdac_out>; -+ }; -+ }; -+ }; -+ -+ hdmi-connector { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi_connector_in: endpoint { -+ remote-endpoint = <&hdmi_tx_tmds_out>; -+ }; -+ }; -+ }; -+ -+ emmc_pwrseq: emmc-pwrseq { -+ compatible = "mmc-pwrseq-emmc"; -+ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; -+ }; -+ -+ sdio_pwrseq: sdio-pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; -+ clocks = <&wifi32k>; -+ clock-names = "ext_clock"; -+ }; -+ -+ ao_5v: regulator-ao_5v { -+ compatible = "regulator-fixed"; -+ regulator-name = "AO_5V"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-always-on; -+ }; -+ -+ vcc_1v8: regulator-vcc_1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC_1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <&vcc_3v3>; -+ regulator-always-on; -+ }; -+ -+ vcc_3v3: regulator-vcc_3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&vddao_3v3>; -+ regulator-always-on; -+ /* FIXME: actually controlled by VDDCPU_B_EN */ -+ }; -+ -+ vddao_1v8: regulator-vddao_1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDIO_AO1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <&vddao_3v3>; -+ regulator-always-on; -+ }; -+ -+ vddao_3v3: regulator-vddao_3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDAO_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&ao_5v>; -+ regulator-always-on; -+ }; -+ -+ vddcpu_a: regulator-vddcpu-a { -+ /* -+ * MP8756GD Regulator. -+ */ -+ compatible = "pwm-regulator"; -+ -+ regulator-name = "VDDCPU_A"; -+ regulator-min-microvolt = <730000>; -+ regulator-max-microvolt = <1010000>; -+ -+ pwm-supply = <&ao_5v>; -+ -+ pwms = <&pwm_ab 0 1250 0>; -+ pwm-dutycycle-range = <100 0>; -+ -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ vddcpu_b: regulator-vddcpu-b { -+ /* -+ * Silergy SY8120B1ABC Regulator. -+ */ -+ compatible = "pwm-regulator"; -+ -+ regulator-name = "VDDCPU_B"; -+ regulator-min-microvolt = <730000>; -+ regulator-max-microvolt = <1010000>; -+ -+ pwm-supply = <&ao_5v>; -+ -+ pwms = <&pwm_AO_cd 1 1250 0>; -+ pwm-dutycycle-range = <100 0>; -+ -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ sound { -+ compatible = "amlogic,axg-sound-card"; -+ model = "RADXA-ZERO2"; -+ audio-aux-devs = <&tdmout_b>; -+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", -+ "TDMOUT_B IN 1", "FRDDR_B OUT 1", -+ "TDMOUT_B IN 2", "FRDDR_C OUT 1", -+ "TDM_B Playback", "TDMOUT_B OUT"; -+ -+ assigned-clocks = <&clkc CLKID_MPLL2>, -+ <&clkc CLKID_MPLL0>, -+ <&clkc CLKID_MPLL1>; -+ assigned-clock-parents = <0>, <0>, <0>; -+ assigned-clock-rates = <294912000>, -+ <270950400>, -+ <393216000>; -+ status = "okay"; -+ -+ dai-link-0 { -+ sound-dai = <&frddr_a>; -+ }; -+ -+ dai-link-1 { -+ sound-dai = <&frddr_b>; -+ }; -+ -+ dai-link-2 { -+ sound-dai = <&frddr_c>; -+ }; -+ -+ /* 8ch hdmi interface */ -+ dai-link-3 { -+ sound-dai = <&tdmif_b>; -+ dai-format = "i2s"; -+ dai-tdm-slot-tx-mask-0 = <1 1>; -+ dai-tdm-slot-tx-mask-1 = <1 1>; -+ dai-tdm-slot-tx-mask-2 = <1 1>; -+ dai-tdm-slot-tx-mask-3 = <1 1>; -+ mclk-fs = <256>; -+ -+ codec { -+ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; -+ }; -+ }; -+ -+ /* hdmi glue */ -+ dai-link-4 { -+ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; -+ -+ codec { -+ sound-dai = <&hdmi_tx>; -+ }; -+ }; -+ }; -+ -+ wifi32k: wifi32k { -+ compatible = "pwm-clock"; -+ #clock-cells = <0>; -+ clock-frequency = <32768>; -+ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ -+ }; -+}; -+ -+&arb { -+ status = "okay"; -+}; -+ -+&cec_AO { -+ pinctrl-0 = <&cec_ao_a_h_pins>; -+ pinctrl-names = "default"; -+ status = "disabled"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ -+&cecb_AO { -+ pinctrl-0 = <&cec_ao_b_h_pins>; -+ pinctrl-names = "default"; -+ status = "okay"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ -+&clkc_audio { -+ status = "okay"; -+}; -+ -+&cpu0 { -+ cpu-supply = <&vddcpu_b>; -+ operating-points-v2 = <&cpu_opp_table_0>; -+ clocks = <&clkc CLKID_CPU_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu1 { -+ cpu-supply = <&vddcpu_b>; -+ operating-points-v2 = <&cpu_opp_table_0>; -+ clocks = <&clkc CLKID_CPU_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu100 { -+ cpu-supply = <&vddcpu_a>; -+ operating-points-v2 = <&cpub_opp_table_1>; -+ clocks = <&clkc CLKID_CPUB_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu101 { -+ cpu-supply = <&vddcpu_a>; -+ operating-points-v2 = <&cpub_opp_table_1>; -+ clocks = <&clkc CLKID_CPUB_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu102 { -+ cpu-supply = <&vddcpu_a>; -+ operating-points-v2 = <&cpub_opp_table_1>; -+ clocks = <&clkc CLKID_CPUB_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu103 { -+ cpu-supply = <&vddcpu_a>; -+ operating-points-v2 = <&cpub_opp_table_1>; -+ clocks = <&clkc CLKID_CPUB_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cvbs_vdac_port { -+ cvbs_vdac_out: endpoint { -+ remote-endpoint = <&cvbs_connector_in>; -+ }; -+}; -+ -+&frddr_a { -+ status = "okay"; -+}; -+ -+&frddr_b { -+ status = "okay"; -+}; -+ -+&frddr_c { -+ status = "okay"; -+}; -+ -+&gpio { -+ gpio-line-names = -+ /* GPIOZ */ -+ "PIN_27", "PIN_28", "PIN_7", "PIN_11", "PIN_13", "PIN_15", "PIN_18", "PIN_40", -+ "", "", "", "", "", "", "", "", -+ /* GPIOH */ -+ "", "", "", "", "PIN_19", "PIN_21", "PIN_24", "PIN_23", -+ "", -+ /* BOOT */ -+ "", "", "", "", "", "", "", "", -+ "", "", "", "", "EMMC_PWRSEQ", "", "", "", -+ /* GPIOC */ -+ "", "", "", "", "", "", "SD_CD", "PIN_36", -+ /* GPIOA */ -+ "PIN_32", "PIN_12", "PIN_35", "", "", "PIN_38", "", "", -+ "", "", "", "", "LED_GREEN", "PIN_31", "PIN_3", "PIN_5", -+ /* GPIOX */ -+ "", "", "", "", "", "", "SDIO_PWRSEQ", "", -+ "", "", "", "", "", "", "", "", -+ "", "BT_SHUTDOWN", "", ""; -+}; -+ -+&gpio_ao { -+ gpio-line-names = -+ /* GPIOAO */ -+ "PIN_8", "PIN_10", "", "BTN_POWER", "", "", "", "PIN_29", -+ "PIN_33", "PIN_37", "FAN", "", -+ /* GPIOE */ -+ "", "", ""; -+}; -+ -+&hdmi_tx { -+ status = "okay"; -+ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; -+ pinctrl-names = "default"; -+ hdmi-supply = <&ao_5v>; -+}; -+ -+&hdmi_tx_tmds_port { -+ hdmi_tx_tmds_out: endpoint { -+ remote-endpoint = <&hdmi_connector_in>; -+ }; -+}; -+ -+&ir { -+ status = "disabled"; -+ pinctrl-0 = <&remote_input_ao_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&pwm_ab { -+ pinctrl-0 = <&pwm_a_e_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin0"; -+ status = "okay"; -+}; -+ -+&pwm_ef { -+ pinctrl-0 = <&pwm_e_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin2"; -+ status = "okay"; -+}; -+ -+&pwm_AO_cd { -+ pinctrl-0 = <&pwm_ao_d_e_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin4"; -+ status = "okay"; -+}; -+ -+&saradc { -+ status = "okay"; -+ vref-supply = <&vddao_1v8>; -+}; -+ -+/* SDIO */ -+&sd_emmc_a { -+ status = "okay"; -+ pinctrl-0 = <&sdio_pins>; -+ pinctrl-1 = <&sdio_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ bus-width = <4>; -+ cap-sd-highspeed; -+ max-frequency = <100000000>; -+ -+ non-removable; -+ disable-wp; -+ -+ /* WiFi firmware requires power to be kept while in suspend */ -+ keep-power-in-suspend; -+ -+ mmc-pwrseq = <&sdio_pwrseq>; -+ -+ vmmc-supply = <&vddao_3v3>; -+ vqmmc-supply = <&vddao_1v8>; -+ -+ brcmf: wifi@1 { -+ reg = <1>; -+ compatible = "brcm,bcm4329-fmac"; -+ }; -+}; -+ -+/* SD card */ -+&sd_emmc_b { -+ status = "okay"; -+ pinctrl-0 = <&sdcard_c_pins>; -+ pinctrl-1 = <&sdcard_clk_gate_c_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <4>; -+ cap-sd-highspeed; -+ max-frequency = <50000000>; -+ disable-wp; -+ -+ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; -+ vmmc-supply = <&vddao_3v3>; -+ vqmmc-supply = <&vddao_3v3>; -+}; -+ -+/* eMMC */ -+&sd_emmc_c { -+ status = "okay"; -+ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; -+ pinctrl-1 = <&emmc_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <8>; -+ cap-mmc-highspeed; -+ mmc-ddr-1_8v; -+ mmc-hs200-1_8v; -+ max-frequency = <200000000>; -+ disable-wp; -+ -+ mmc-pwrseq = <&emmc_pwrseq>; -+ vmmc-supply = <&vcc_3v3>; -+ vqmmc-supply = <&vcc_1v8>; -+}; -+ -+&tdmif_b { -+ status = "okay"; -+}; -+ -+&tdmout_b { -+ status = "okay"; -+}; -+ -+&tohdmitx { -+ status = "okay"; -+}; -+ -+&uart_A { -+ status = "okay"; -+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; -+ pinctrl-names = "default"; -+ uart-has-rtscts; -+ -+ bluetooth { -+ compatible = "brcm,bcm43438-bt"; -+ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; -+ max-speed = <2000000>; -+ clocks = <&wifi32k>; -+ clock-names = "lpo"; -+ }; -+}; -+ -+&usb { -+ status = "okay"; -+}; --- -2.34.1 - diff --git a/patch/u-boot/v2022.10/board_radxa-zero2/0001-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch b/patch/u-boot/v2022.10/board_radxa-zero2/0001-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch deleted file mode 100644 index dc1f6d903..000000000 --- a/patch/u-boot/v2022.10/board_radxa-zero2/0001-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch +++ /dev/null @@ -1,623 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Sat, 15 Jan 2022 06:17:23 +0000 -Subject: WIP: ARM: dts: add support for Radxa Zero2 - -Import the initial dts (WIP) from chewitt/amlogic-5.16.y - -Signed-off-by: Christian Hewitt -Signed-off-by: Yuntian Zhang ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi | 7 + - arch/arm/dts/meson-g12b-radxa-zero2.dts | 574 ++++++++++ - 3 files changed, 582 insertions(+) - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 965895bc2a3..717be756d60 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -200,6 +200,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ - meson-g12b-gsking-x.dtb \ - meson-g12b-odroid-n2.dtb \ - meson-g12b-odroid-n2-plus.dtb \ -+ meson-g12b-radxa-zero2.dtb \ - meson-sm1-bananapi-m5.dtb \ - meson-sm1-khadas-vim3l.dtb \ - meson-sm1-odroid-c4.dtb \ -diff --git a/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi b/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi -new file mode 100644 -index 00000000000..236f2468dc2 ---- /dev/null -+++ b/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi -@@ -0,0 +1,7 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2019 BayLibre, SAS. -+ * Author: Neil Armstrong -+ */ -+ -+#include "meson-g12-common-u-boot.dtsi" -diff --git a/arch/arm/dts/meson-g12b-radxa-zero2.dts b/arch/arm/dts/meson-g12b-radxa-zero2.dts -new file mode 100644 -index 00000000000..f7da62ccf0d ---- /dev/null -+++ b/arch/arm/dts/meson-g12b-radxa-zero2.dts -@@ -0,0 +1,574 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2019 BayLibre, SAS -+ * Author: Neil Armstrong -+ * Copyright (c) 2019 Christian Hewitt -+ * Copyright (c) 2022 Radxa Limited -+ * Author: Yuntian Zhang -+ */ -+ -+/dts-v1/; -+ -+#include "meson-g12b-a311d.dtsi" -+#include -+#include -+#include -+#include -+ -+/ { -+ compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b"; -+ model = "Radxa Zero2"; -+ -+ aliases { -+ serial0 = &uart_AO; -+ serial2 = &uart_A; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ fan0: pwm-fan { -+ compatible = "pwm-fan"; -+ #cooling-cells = <2>; -+ cooling-min-state = <0>; -+ cooling-max-state = <3>; -+ cooling-levels = <0 120 170 220>; -+ pwms = <&pwm_AO_ab 0 40000 0>; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x0 0x0 0x80000000>; -+ }; -+ -+ gpio-keys-polled { -+ compatible = "gpio-keys-polled"; -+ poll-interval = <100>; -+ power-button { -+ label = "power"; -+ linux,code = ; -+ gpios = <&gpio_ao GPIOAO_3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ led-green { -+ color = ; -+ function = LED_FUNCTION_STATUS; -+ gpios = <&gpio GPIOA_12 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ -+ cvbs-connector { -+ status = "disabled"; -+ compatible = "composite-video-connector"; -+ -+ port { -+ cvbs_connector_in: endpoint { -+ remote-endpoint = <&cvbs_vdac_out>; -+ }; -+ }; -+ }; -+ -+ hdmi-connector { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi_connector_in: endpoint { -+ remote-endpoint = <&hdmi_tx_tmds_out>; -+ }; -+ }; -+ }; -+ -+ emmc_pwrseq: emmc-pwrseq { -+ compatible = "mmc-pwrseq-emmc"; -+ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; -+ }; -+ -+ sdio_pwrseq: sdio-pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; -+ clocks = <&wifi32k>; -+ clock-names = "ext_clock"; -+ }; -+ -+ typec2_vbus: regulator-typec2_vbus { -+ compatible = "regulator-fixed"; -+ regulator-name = "TYPEC2_VBUS"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&ao_5v>; -+ }; -+ -+ ao_5v: regulator-ao_5v { -+ compatible = "regulator-fixed"; -+ regulator-name = "AO_5V"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-always-on; -+ }; -+ -+ vcc_1v8: regulator-vcc_1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC_1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <&vcc_3v3>; -+ regulator-always-on; -+ }; -+ -+ vcc_3v3: regulator-vcc_3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&vddao_3v3>; -+ regulator-always-on; -+ /* FIXME: actually controlled by VDDCPU_B_EN */ -+ }; -+ -+ vddao_1v8: regulator-vddao_1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDIO_AO1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <&vddao_3v3>; -+ regulator-always-on; -+ }; -+ -+ vddao_3v3: regulator-vddao_3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDAO_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&ao_5v>; -+ regulator-always-on; -+ }; -+ -+ vddcpu_a: regulator-vddcpu-a { -+ /* -+ * MP8756GD Regulator. -+ */ -+ compatible = "pwm-regulator"; -+ -+ regulator-name = "VDDCPU_A"; -+ regulator-min-microvolt = <730000>; -+ regulator-max-microvolt = <1022000>; -+ -+ pwm-supply = <&ao_5v>; -+ -+ pwms = <&pwm_ab 0 1250 0>; -+ pwm-dutycycle-range = <100 0>; -+ -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ vddcpu_b: regulator-vddcpu-b { -+ /* -+ * Silergy SY8120B1ABC Regulator. -+ */ -+ compatible = "pwm-regulator"; -+ -+ regulator-name = "VDDCPU_B"; -+ regulator-min-microvolt = <730000>; -+ regulator-max-microvolt = <1022000>; -+ -+ pwm-supply = <&ao_5v>; -+ -+ pwms = <&pwm_AO_cd 1 1250 0>; -+ pwm-dutycycle-range = <100 0>; -+ -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ sound { -+ compatible = "amlogic,axg-sound-card"; -+ model = "RADXA-ZERO2"; -+ audio-aux-devs = <&tdmout_b>; -+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", -+ "TDMOUT_B IN 1", "FRDDR_B OUT 1", -+ "TDMOUT_B IN 2", "FRDDR_C OUT 1", -+ "TDM_B Playback", "TDMOUT_B OUT"; -+ -+ assigned-clocks = <&clkc CLKID_MPLL2>, -+ <&clkc CLKID_MPLL0>, -+ <&clkc CLKID_MPLL1>; -+ assigned-clock-parents = <0>, <0>, <0>; -+ assigned-clock-rates = <294912000>, -+ <270950400>, -+ <393216000>; -+ status = "okay"; -+ -+ dai-link-0 { -+ sound-dai = <&frddr_a>; -+ }; -+ -+ dai-link-1 { -+ sound-dai = <&frddr_b>; -+ }; -+ -+ dai-link-2 { -+ sound-dai = <&frddr_c>; -+ }; -+ -+ /* 8ch hdmi interface */ -+ dai-link-3 { -+ sound-dai = <&tdmif_b>; -+ dai-format = "i2s"; -+ dai-tdm-slot-tx-mask-0 = <1 1>; -+ dai-tdm-slot-tx-mask-1 = <1 1>; -+ dai-tdm-slot-tx-mask-2 = <1 1>; -+ dai-tdm-slot-tx-mask-3 = <1 1>; -+ mclk-fs = <256>; -+ -+ codec { -+ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; -+ }; -+ }; -+ -+ /* hdmi glue */ -+ dai-link-4 { -+ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; -+ -+ codec { -+ sound-dai = <&hdmi_tx>; -+ }; -+ }; -+ }; -+ -+ wifi32k: wifi32k { -+ compatible = "pwm-clock"; -+ #clock-cells = <0>; -+ clock-frequency = <32768>; -+ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ -+ }; -+}; -+ -+&periphs_pinctrl { -+ /* Ensure the TYPE C controller irq pin is not driven by the SoC */ -+ fusb302_irq_pins: fusb302_irq { -+ mux { -+ groups = "GPIOA_4"; -+ function = "gpio_periphs"; -+ bias-pull-up; -+ output-disable; -+ }; -+ }; -+}; -+ -+&arb { -+ status = "okay"; -+}; -+ -+&cec_AO { -+ pinctrl-0 = <&cec_ao_a_h_pins>; -+ pinctrl-names = "default"; -+ status = "disabled"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ -+&cecb_AO { -+ pinctrl-0 = <&cec_ao_b_h_pins>; -+ pinctrl-names = "default"; -+ status = "okay"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ -+&clkc_audio { -+ status = "okay"; -+}; -+ -+&cpu0 { -+ cpu-supply = <&vddcpu_b>; -+ operating-points-v2 = <&cpu_opp_table_0>; -+ clocks = <&clkc CLKID_CPU_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu1 { -+ cpu-supply = <&vddcpu_b>; -+ operating-points-v2 = <&cpu_opp_table_0>; -+ clocks = <&clkc CLKID_CPU_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu100 { -+ cpu-supply = <&vddcpu_a>; -+ operating-points-v2 = <&cpub_opp_table_1>; -+ clocks = <&clkc CLKID_CPUB_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu101 { -+ cpu-supply = <&vddcpu_a>; -+ operating-points-v2 = <&cpub_opp_table_1>; -+ clocks = <&clkc CLKID_CPUB_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu102 { -+ cpu-supply = <&vddcpu_a>; -+ operating-points-v2 = <&cpub_opp_table_1>; -+ clocks = <&clkc CLKID_CPUB_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu103 { -+ cpu-supply = <&vddcpu_a>; -+ operating-points-v2 = <&cpub_opp_table_1>; -+ clocks = <&clkc CLKID_CPUB_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cvbs_vdac_port { -+ cvbs_vdac_out: endpoint { -+ remote-endpoint = <&cvbs_connector_in>; -+ }; -+}; -+ -+&frddr_a { -+ status = "okay"; -+}; -+ -+&frddr_b { -+ status = "okay"; -+}; -+ -+&frddr_c { -+ status = "okay"; -+}; -+ -+&gpio { -+ gpio-line-names = -+ /* GPIOZ */ -+ "PIN_27", "PIN_28", "PIN_7", "PIN_11", "PIN_13", "PIN_15", "PIN_18", "PIN_40", -+ "PIN_16", "PIN_22", "", "", "", "", "", "", -+ /* GPIOH */ -+ "", "", "", "", "PIN_19", "PIN_21", "PIN_24", "PIN_23", -+ "", -+ /* BOOT */ -+ "", "", "", "", "", "", "", "", -+ "", "", "", "", "EMMC_PWRSEQ", "", "", "", -+ /* GPIOC */ -+ "", "", "", "", "", "", "SD_CD", "PIN_36", -+ /* GPIOA */ -+ "PIN_32", "PIN_12", "PIN_35", "", "FUSB_IRQ", "PIN_38", "", "", -+ "", "", "", "", "LED_GREEN", "PIN_31", "PIN_3", "PIN_5", -+ /* GPIOX */ -+ "", "", "", "", "", "", "SDIO_PWRSEQ", "", -+ "", "", "", "", "", "", "", "", -+ "", "BT_SHUTDOWN", "", ""; -+}; -+ -+&gpio_ao { -+ gpio-line-names = -+ /* GPIOAO */ -+ "PIN_8", "PIN_10", "", "BTN_POWER", "", "", "", "PIN_29", -+ "PIN_33", "PIN_37", "", "FAN", -+ /* GPIOE */ -+ "", "", ""; -+}; -+ -+&hdmi_tx { -+ status = "okay"; -+ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; -+ pinctrl-names = "default"; -+ hdmi-supply = <&ao_5v>; -+}; -+ -+&hdmi_tx_tmds_port { -+ hdmi_tx_tmds_out: endpoint { -+ remote-endpoint = <&hdmi_connector_in>; -+ }; -+}; -+ -+&cpu_thermal { -+ cooling-maps { -+ map0 { -+ trip = <&cpu_passive>; -+ cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ }; -+}; -+ -+&ddr_thermal { -+ cooling-maps { -+ map0 { -+ trip = <&ddr_passive>; -+ cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ }; -+}; -+ -+&ir { -+ status = "disabled"; -+ pinctrl-0 = <&remote_input_ao_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&i2c3 { -+ fusb302@22 { -+ compatible = "fcs,fusb302"; -+ reg = <0x22>; -+ -+ pinctrl-0 = <&fusb302_irq_pins>; -+ pinctrl-names = "default"; -+ interrupt-parent = <&gpio_intc>; -+ interrupts = <59 IRQ_TYPE_LEVEL_LOW>; -+ -+ vbus-supply = <&typec2_vbus>; -+ -+ status = "okay"; -+ }; -+}; -+ -+&pwm_ab { -+ pinctrl-0 = <&pwm_a_e_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin0"; -+ status = "okay"; -+}; -+ -+&pwm_ef { -+ pinctrl-0 = <&pwm_e_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin2"; -+ status = "okay"; -+}; -+ -+&pwm_AO_ab { -+ pinctrl-0 = <&pwm_ao_a_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin3"; -+ status = "okay"; -+}; -+ -+&pwm_AO_cd { -+ pinctrl-0 = <&pwm_ao_d_e_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin4"; -+ status = "okay"; -+}; -+ -+&saradc { -+ status = "okay"; -+ vref-supply = <&vddao_1v8>; -+}; -+ -+/* SDIO */ -+&sd_emmc_a { -+ status = "okay"; -+ pinctrl-0 = <&sdio_pins>; -+ pinctrl-1 = <&sdio_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ bus-width = <4>; -+ cap-sd-highspeed; -+ max-frequency = <80000000>; -+ -+ non-removable; -+ disable-wp; -+ -+ /* WiFi firmware requires power to be kept while in suspend */ -+ keep-power-in-suspend; -+ -+ mmc-pwrseq = <&sdio_pwrseq>; -+ -+ vmmc-supply = <&vddao_3v3>; -+ vqmmc-supply = <&vddao_1v8>; -+ -+ brcmf: wifi@1 { -+ reg = <1>; -+ compatible = "brcm,bcm4329-fmac"; -+ }; -+}; -+ -+/* SD card */ -+&sd_emmc_b { -+ status = "okay"; -+ pinctrl-0 = <&sdcard_c_pins>; -+ pinctrl-1 = <&sdcard_clk_gate_c_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <4>; -+ cap-sd-highspeed; -+ max-frequency = <50000000>; -+ disable-wp; -+ -+ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; -+ vmmc-supply = <&vddao_3v3>; -+ vqmmc-supply = <&vddao_3v3>; -+}; -+ -+/* eMMC */ -+&sd_emmc_c { -+ status = "okay"; -+ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; -+ pinctrl-1 = <&emmc_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <8>; -+ cap-mmc-highspeed; -+ mmc-ddr-1_8v; -+ mmc-hs200-1_8v; -+ max-frequency = <200000000>; -+ disable-wp; -+ -+ mmc-pwrseq = <&emmc_pwrseq>; -+ vmmc-supply = <&vcc_3v3>; -+ vqmmc-supply = <&vcc_1v8>; -+}; -+ -+&tdmif_b { -+ status = "okay"; -+}; -+ -+&tdmout_b { -+ status = "okay"; -+}; -+ -+&tohdmitx { -+ status = "okay"; -+}; -+ -+&uart_A { -+ status = "okay"; -+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; -+ pinctrl-names = "default"; -+ uart-has-rtscts; -+ -+ bluetooth { -+ compatible = "brcm,bcm43438-bt"; -+ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; -+ max-speed = <2000000>; -+ clocks = <&wifi32k>; -+ clock-names = "lpo"; -+ }; -+}; -+ -+&uart_AO { -+ status = "okay"; -+ pinctrl-0 = <&uart_ao_a_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&usb { -+ status = "okay"; -+}; -+ -+&usb3_pcie_phy { -+ phy-supply = <&typec2_vbus>; -+}; --- -Armbian - diff --git a/patch/u-boot/v2022.10/board_radxa-zero2/0002-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/patch/u-boot/v2022.10/board_radxa-zero2/0002-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch deleted file mode 100644 index 6afcbeaf5..000000000 --- a/patch/u-boot/v2022.10/board_radxa-zero2/0002-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Sat, 15 Jan 2022 06:23:29 +0000 -Subject: WIP: boards: amlogic: add Radxa Zero2 defconfig - -Add a defconfig for the Radxa Zero2 SBC, using an Amlogic A311D chip. - -Signed-off-by: Christian Hewitt -Signed-off-by: Yuntian Zhang ---- - board/amlogic/w400/MAINTAINERS | 1 + - configs/radxa-zero2_defconfig | 68 ++++++++++ - 2 files changed, 69 insertions(+) - -diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS -index 96ccda20011..caad41577df 100644 ---- a/board/amlogic/w400/MAINTAINERS -+++ b/board/amlogic/w400/MAINTAINERS -@@ -3,4 +3,5 @@ M: Neil Armstrong - S: Maintained - L: u-boot-amlogic@groups.io - F: board/amlogic/w400/ -+F: configs/radxa-zero2_defconfig - F: doc/board/amlogic/w400.rst -diff --git a/configs/radxa-zero2_defconfig b/configs/radxa-zero2_defconfig -new file mode 100644 -index 00000000000..65f5a3bfe6d ---- /dev/null -+++ b/configs/radxa-zero2_defconfig -@@ -0,0 +1,68 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_MESON=y -+CONFIG_SYS_TEXT_BASE=0x01000000 -+CONFIG_NR_DRAM_BANKS=1 -+CONFIG_ENV_SIZE=0x2000 -+CONFIG_DM_GPIO=y -+CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-radxa-zero2" -+CONFIG_MESON_G12A=y -+CONFIG_DEBUG_UART_BASE=0xff803000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_IDENT_STRING=" radxa-zero2" -+CONFIG_SYS_LOAD_ADDR=0x1000000 -+CONFIG_DEBUG_UART=y -+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 -+CONFIG_REMAKE_ELF=y -+CONFIG_OF_BOARD_SETUP=y -+# CONFIG_DISPLAY_CPUINFO is not set -+CONFIG_MISC_INIT_R=y -+CONFIG_SYS_MAXARGS=32 -+# CONFIG_CMD_BDI is not set -+# CONFIG_CMD_IMI is not set -+CONFIG_CMD_GPIO=y -+# CONFIG_CMD_LOADS is not set -+CONFIG_CMD_MMC=y -+CONFIG_CMD_USB=y -+CONFIG_CMD_USB_MASS_STORAGE=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_REGULATOR=y -+CONFIG_OF_CONTROL=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_MMC_MESON_GX=y -+CONFIG_MTD=y -+CONFIG_DM_MTD=y -+CONFIG_MESON_G12A_USB_PHY=y -+CONFIG_PINCTRL=y -+CONFIG_PINCTRL_MESON_G12A=y -+CONFIG_POWER_DOMAIN=y -+CONFIG_MESON_EE_POWER_DOMAIN=y -+CONFIG_DM_REGULATOR=y -+CONFIG_DM_REGULATOR_FIXED=y -+CONFIG_DM_RESET=y -+CONFIG_DEBUG_UART_ANNOUNCE=y -+CONFIG_DEBUG_UART_SKIP_INIT=y -+CONFIG_MESON_SERIAL=y -+CONFIG_USB=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_DWC3=y -+CONFIG_USB_DWC3=y -+# CONFIG_USB_DWC3_GADGET is not set -+CONFIG_USB_DWC3_MESON_G12A=y -+CONFIG_USB_KEYBOARD=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e -+CONFIG_USB_GADGET_PRODUCT_NUM=0xfada -+CONFIG_USB_GADGET_DWC2_OTG=y -+CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y -+CONFIG_USB_GADGET_DOWNLOAD=y -+CONFIG_DM_VIDEO=y -+# CONFIG_VIDEO_BPP8 is not set -+# CONFIG_VIDEO_BPP16 is not set -+CONFIG_SYS_WHITE_ON_BLACK=y -+CONFIG_VIDEO_MESON=y -+CONFIG_VIDEO_DT_SIMPLEFB=y -+CONFIG_SPLASH_SCREEN=y -+CONFIG_SPLASH_SCREEN_ALIGN=y -+CONFIG_OF_LIBFDT_OVERLAY=y --- -Armbian - diff --git a/patch/u-boot/v2023.01/board_odroidhc4/0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoconsole.patch b/patch/u-boot/v2023.01/board_odroidhc4/0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoconsole.patch index 861908fa7..2a0f70e85 100644 --- a/patch/u-boot/v2023.01/board_odroidhc4/0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoconsole.patch +++ b/patch/u-boot/v2023.01/board_odroidhc4/0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoconsole.patch @@ -1,8 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jihoon Han Date: Mon, 11 Dec 2023 04:47:08 +0900 -Subject: [PATCH] HACK: configs: meson64: prevent stdout/stderr on - videoconsole +Subject: HACK: configs: meson64: prevent stdout/stderr on videoconsole Several devices have CONFIG_DM_VIDEO enabled which causes stdout/stderr to appear on videoconsole, so remove videoconsole from STDOUT so that @@ -14,12 +13,10 @@ Signed-off-by: Jihoon Han 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index d21899c335..2ac866c9ca 100644 +index 726f33c26c2a..f97f83d8607f 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h -@@ -23,11 +23,11 @@ - 230400, 250000, 460800, 500000, 1000000, 2000000, 4000000, \ - 8000000 } +@@ -25,7 +25,7 @@ /* For splashscreen */ #ifdef CONFIG_VIDEO @@ -28,8 +25,6 @@ index d21899c335..2ac866c9ca 100644 #else #define STDOUT_CFG "serial" #endif - - #ifdef CONFIG_USB_KEYBOARD -- -Created with Armbian build tools https://github.com/armbian/build +Armbian diff --git a/patch/u-boot/v2023.01/board_odroidhc4/board.odroidhc4.hc4_sd_defconfig.for.writing.to.mtd.patch b/patch/u-boot/v2023.01/board_odroidhc4/board.odroidhc4.hc4_sd_defconfig.for.writing.to.mtd.patch index f2dd2005d..88ecf17f1 100644 --- a/patch/u-boot/v2023.01/board_odroidhc4/board.odroidhc4.hc4_sd_defconfig.for.writing.to.mtd.patch +++ b/patch/u-boot/v2023.01/board_odroidhc4/board.odroidhc4.hc4_sd_defconfig.for.writing.to.mtd.patch @@ -59,7 +59,7 @@ Below are a few different tries I've made: diff --git a/configs/odroid-hc4_sd_defconfig b/configs/odroid-hc4_sd_defconfig new file mode 100644 -index 0000000000..7d2736b2bb +index 000000000000..7d2736b2bbf5 --- /dev/null +++ b/configs/odroid-hc4_sd_defconfig @@ -0,0 +1,77 @@ diff --git a/patch/u-boot/v2023.01/board_odroidhc4/board.odroidhc4.preboot.pci.enum.usb.start.patch b/patch/u-boot/v2023.01/board_odroidhc4/board.odroidhc4.preboot.pci.enum.usb.start.patch index d03220401..873c74273 100644 --- a/patch/u-boot/v2023.01/board_odroidhc4/board.odroidhc4.preboot.pci.enum.usb.start.patch +++ b/patch/u-boot/v2023.01/board_odroidhc4/board.odroidhc4.preboot.pci.enum.usb.start.patch @@ -24,7 +24,7 @@ specially the c4 patch https://lore.kernel.org/all/20230121175639.12818-8-linux. 1 file changed, 2 insertions(+) diff --git a/configs/odroid-hc4_defconfig b/configs/odroid-hc4_defconfig -index 1af9c11395..a006ef924e 100644 +index 1af9c1139538..a006ef924eaf 100644 --- a/configs/odroid-hc4_defconfig +++ b/configs/odroid-hc4_defconfig @@ -17,6 +17,8 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y diff --git a/patch/u-boot/v2023.01/board_rockpro64/mmc-sdhci-allow-disabling-sdma-in-spl.patch b/patch/u-boot/v2023.01/board_rockpro64/mmc-sdhci-allow-disabling-sdma-in-spl.patch index ef6d9b44c..e421f6072 100644 --- a/patch/u-boot/v2023.01/board_rockpro64/mmc-sdhci-allow-disabling-sdma-in-spl.patch +++ b/patch/u-boot/v2023.01/board_rockpro64/mmc-sdhci-allow-disabling-sdma-in-spl.patch @@ -1,8 +1,7 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Geis -To: Peng Fan , Jaehoon Chung -Cc: Peter Geis , u-boot@lists.denx.de -Subject: [PATCH v1 02/11] mmc: sdhci: allow disabling sdma in spl Date: Mon, 21 Feb 2022 20:31:21 -0500 +Subject: mmc: sdhci: allow disabling sdma in spl Rockchip emmc devices have a similar issue to Rockchip dwmmc devices, where performing dma to sram causes errors with suspend/resume. @@ -17,10 +16,10 @@ Reviewed-by: Jaehoon Chung 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig -index f04cc44e1973..1e4342285ce7 100644 +index bf4d994ff695..6a959db956f4 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig -@@ -468,6 +468,13 @@ config MMC_SDHCI_SDMA +@@ -471,6 +471,13 @@ config MMC_SDHCI_SDMA This enables support for the SDMA (Single Operation DMA) defined in the SD Host Controller Standard Specification Version 1.00 . @@ -35,7 +34,7 @@ index f04cc44e1973..1e4342285ce7 100644 bool "Support SDHCI ADMA2" depends on MMC_SDHCI diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c -index 766e4a6b0c5e..6285e53d12a2 100644 +index a80ad8329a38..3c44e5d8d4d2 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -70,7 +70,7 @@ static void sdhci_transfer_pio(struct sdhci_host *host, struct mmc_data *data) @@ -56,7 +55,7 @@ index 766e4a6b0c5e..6285e53d12a2 100644 dma_unmap_single(host->start_addr, data->blocks * data->blocksize, mmc_get_dma_dir(data)); #endif -@@ -836,7 +836,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, +@@ -856,7 +856,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, #endif debug("%s, caps: 0x%x\n", __func__, caps); @@ -65,3 +64,6 @@ index 766e4a6b0c5e..6285e53d12a2 100644 if ((caps & SDHCI_CAN_DO_SDMA)) { host->flags |= USE_SDMA; } else { +-- +Armbian + diff --git a/patch/u-boot/v2023.01/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2023.01/meson64-boot-usb-nvme-scsi-first.patch index 64bdb51a0..3ab90ba2c 100644 --- a/patch/u-boot/v2023.01/meson64-boot-usb-nvme-scsi-first.patch +++ b/patch/u-boot/v2023.01/meson64-boot-usb-nvme-scsi-first.patch @@ -10,7 +10,7 @@ meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and SCSI before S 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index 726f33c26c..d21899c335 100644 +index 726f33c26c2a..d21899c335fb 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -71,12 +71,12 @@ diff --git a/patch/u-boot/v2023.07.02/board_radxa-zero/001-HACK-mmc-meson-gx-limit-to-24MHz.patch b/patch/u-boot/v2023.07.02/board_radxa-zero/001-HACK-mmc-meson-gx-limit-to-24MHz.patch index ce06690ad..116dec7ac 100644 --- a/patch/u-boot/v2023.07.02/board_radxa-zero/001-HACK-mmc-meson-gx-limit-to-24MHz.patch +++ b/patch/u-boot/v2023.07.02/board_radxa-zero/001-HACK-mmc-meson-gx-limit-to-24MHz.patch @@ -1,7 +1,7 @@ -From b55ab13244c8c175447fb1becdd25690e011b6c3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Fri, 28 Jul 2023 13:32:12 -0400 -Subject: [PATCH] HACK: mmc-meson-gx limit to 24MHz +Subject: HACK: mmc-meson-gx limit to 24MHz Signed-off-by: Patrick Yavitz --- @@ -9,7 +9,7 @@ Signed-off-by: Patrick Yavitz 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c -index fcf4f03d1e..6ded4b619b 100644 +index fcf4f03d1e24..6ded4b619bf1 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -279,7 +279,7 @@ static int meson_mmc_probe(struct udevice *dev) @@ -22,5 +22,5 @@ index fcf4f03d1e..6ded4b619b 100644 cfg->name = dev->name; -- -2.39.2 +Armbian diff --git a/patch/u-boot/v2023.07.02/board_radxa-zero/002-configs-radxa-zero_defconfig-enable-preboot.patch b/patch/u-boot/v2023.07.02/board_radxa-zero/002-configs-radxa-zero_defconfig-enable-preboot.patch index fccfd7956..f93af941a 100644 --- a/patch/u-boot/v2023.07.02/board_radxa-zero/002-configs-radxa-zero_defconfig-enable-preboot.patch +++ b/patch/u-boot/v2023.07.02/board_radxa-zero/002-configs-radxa-zero_defconfig-enable-preboot.patch @@ -1,7 +1,7 @@ -From aaf00ce5ed077cc36a089bce62a2dac2281ce728 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Sat, 20 Jan 2024 05:39:52 -0500 -Subject: [PATCH] configs: radxa-zero_defconfig: enable preboot +Subject: configs: radxa-zero_defconfig: enable preboot CONFIG_USE_PREBOOT=y @@ -11,7 +11,7 @@ Signed-off-by: Patrick Yavitz 1 file changed, 1 insertion(+) diff --git a/configs/radxa-zero_defconfig b/configs/radxa-zero_defconfig -index 23f30f6b11..b3392825b7 100644 +index 23f30f6b113c..b3392825b7cf 100644 --- a/configs/radxa-zero_defconfig +++ b/configs/radxa-zero_defconfig @@ -17,6 +17,7 @@ CONFIG_SYS_LOAD_ADDR=0x1000000 @@ -23,5 +23,5 @@ index 23f30f6b11..b3392825b7 100644 CONFIG_MISC_INIT_R=y CONFIG_SYS_MAXARGS=32 -- -2.39.2 +Armbian diff --git a/patch/u-boot/v2023.10/board_khadas-vim3/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2023.10/board_khadas-vim3/meson64-boot-usb-nvme-scsi-first.patch deleted file mode 100644 index 4676681e3..000000000 --- a/patch/u-boot/v2023.10/board_khadas-vim3/meson64-boot-usb-nvme-scsi-first.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Mon, 14 Nov 2022 14:59:45 +0100 -Subject: meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and - SCSI before SD, MMC, PXE, DHCP - -meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and SCSI before SD, MMC, PXE, DHCP ---- - include/configs/meson64.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index 801cdae4708..927919ef17a 100644 ---- a/include/configs/meson64.h -+++ b/include/configs/meson64.h -@@ -74,12 +74,12 @@ - #ifndef BOOT_TARGET_DEVICES - #define BOOT_TARGET_DEVICES(func) \ - func(ROMUSB, romusb, na) \ -- func(MMC, mmc, 0) \ -- func(MMC, mmc, 1) \ -- func(MMC, mmc, 2) \ - BOOT_TARGET_DEVICES_USB(func) \ - BOOT_TARGET_NVME(func) \ - BOOT_TARGET_SCSI(func) \ -+ func(MMC, mmc, 0) \ -+ func(MMC, mmc, 1) \ -+ func(MMC, mmc, 2) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - #endif --- -Armbian - diff --git a/patch/u-boot/v2023.10/board_khadas-vim3l/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2023.10/board_khadas-vim3l/meson64-boot-usb-nvme-scsi-first.patch deleted file mode 100644 index 4676681e3..000000000 --- a/patch/u-boot/v2023.10/board_khadas-vim3l/meson64-boot-usb-nvme-scsi-first.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Mon, 14 Nov 2022 14:59:45 +0100 -Subject: meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and - SCSI before SD, MMC, PXE, DHCP - -meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and SCSI before SD, MMC, PXE, DHCP ---- - include/configs/meson64.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index 801cdae4708..927919ef17a 100644 ---- a/include/configs/meson64.h -+++ b/include/configs/meson64.h -@@ -74,12 +74,12 @@ - #ifndef BOOT_TARGET_DEVICES - #define BOOT_TARGET_DEVICES(func) \ - func(ROMUSB, romusb, na) \ -- func(MMC, mmc, 0) \ -- func(MMC, mmc, 1) \ -- func(MMC, mmc, 2) \ - BOOT_TARGET_DEVICES_USB(func) \ - BOOT_TARGET_NVME(func) \ - BOOT_TARGET_SCSI(func) \ -+ func(MMC, mmc, 0) \ -+ func(MMC, mmc, 1) \ -+ func(MMC, mmc, 2) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - #endif --- -Armbian - diff --git a/patch/u-boot/v2023.10/board_odroidm1/0001-rockchip-common-boot-USB-devices-first-then-mmc-s-nvme-scsi.patch b/patch/u-boot/v2023.10/board_odroidm1/0001-rockchip-common-boot-USB-devices-first-then-mmc-s-nvme-scsi.patch index a6cb0b456..4368c2302 100644 --- a/patch/u-boot/v2023.10/board_odroidm1/0001-rockchip-common-boot-USB-devices-first-then-mmc-s-nvme-scsi.patch +++ b/patch/u-boot/v2023.10/board_odroidm1/0001-rockchip-common-boot-USB-devices-first-then-mmc-s-nvme-scsi.patch @@ -1,15 +1,14 @@ -From 469ec598330cc46b01bd1f33a9fe422b9230d22c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 16 Aug 2023 13:54:31 +0200 -Subject: [PATCH 1/4] rockchip-common: boot USB devices first, then mmc's, - nvme, scsi +Subject: rockchip-common: boot USB devices first, then mmc's, nvme, scsi --- include/configs/rockchip-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h -index 9121bba3738..1204113f63e 100644 +index 9121bba37384..1204113f63e0 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -13,7 +13,7 @@ @@ -22,5 +21,5 @@ index 9121bba3738..1204113f63e 100644 #ifdef CONFIG_ARM64 #define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0" -- -2.41.0 +Armbian diff --git a/patch/u-boot/v2023.10/board_odroidm1/0002-board-rockchip-ODROID-M1-override-kernel-DT-for-xhci-otg-dr_mode.patch b/patch/u-boot/v2023.10/board_odroidm1/0002-board-rockchip-ODROID-M1-override-kernel-DT-for-xhci-otg-dr_mode.patch index 0dd08dea5..84cff4fb3 100644 --- a/patch/u-boot/v2023.10/board_odroidm1/0002-board-rockchip-ODROID-M1-override-kernel-DT-for-xhci-otg-dr_mode.patch +++ b/patch/u-boot/v2023.10/board_odroidm1/0002-board-rockchip-ODROID-M1-override-kernel-DT-for-xhci-otg-dr_mode.patch @@ -1,15 +1,14 @@ -From 1b476772c1e8559e8acc0f50361e90ee0e8355fa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Fri, 18 Aug 2023 00:22:23 +0200 -Subject: [PATCH 2/4] board: rockchip: ODROID-M1: override kernel DT for xhci - otg dr_mode +Subject: board: rockchip: ODROID-M1: override kernel DT for xhci otg dr_mode --- arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi -index 0fc360b06df..b4dec9d7a60 100644 +index 0fc360b06df7..b4dec9d7a609 100644 --- a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi +++ b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi @@ -35,3 +35,7 @@ @@ -21,5 +20,5 @@ index 0fc360b06df..b4dec9d7a60 100644 + dr_mode = "otg"; +}; -- -2.41.0 +Armbian diff --git a/patch/u-boot/v2023.10/board_odroidm1/0003-board-rockchip-ODROID-M1-enable-DM_USB_GADGET-UMS-RockUSB.patch b/patch/u-boot/v2023.10/board_odroidm1/0003-board-rockchip-ODROID-M1-enable-DM_USB_GADGET-UMS-RockUSB.patch index 7a024d5fe..fcfbd31b5 100644 --- a/patch/u-boot/v2023.10/board_odroidm1/0003-board-rockchip-ODROID-M1-enable-DM_USB_GADGET-UMS-RockUSB.patch +++ b/patch/u-boot/v2023.10/board_odroidm1/0003-board-rockchip-ODROID-M1-enable-DM_USB_GADGET-UMS-RockUSB.patch @@ -1,15 +1,14 @@ -From e888d156c517613984d3cba08a8abaf48dc1c209 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Fri, 18 Aug 2023 00:38:03 +0200 -Subject: [PATCH 3/4] board: rockchip: ODROID-M1: enable DM_USB_GADGET & UMS & - RockUSB +Subject: board: rockchip: ODROID-M1: enable DM_USB_GADGET & UMS & RockUSB --- configs/odroid-m1-rk3568_defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/odroid-m1-rk3568_defconfig b/configs/odroid-m1-rk3568_defconfig -index 96b4e9ecdaf..f1dee2e0e24 100644 +index 96b4e9ecdaff..f1dee2e0e24a 100644 --- a/configs/odroid-m1-rk3568_defconfig +++ b/configs/odroid-m1-rk3568_defconfig @@ -52,6 +52,8 @@ CONFIG_CMD_MMC=y @@ -47,5 +46,5 @@ index 96b4e9ecdaf..f1dee2e0e24 100644 CONFIG_FS_CRAMFS=y CONFIG_ERRNO_STR=y -- -2.41.0 +Armbian diff --git a/patch/u-boot/v2023.10/board_odroidm1/0004-board-rockchip-ODROID-M1-use-env-in-SPI-use-HK-s-offset-size-for-SPI-env-enable-LED_GPIO-use-preboot-to-blink-all-leds-leave-red-one-on-clear-env-once.patch b/patch/u-boot/v2023.10/board_odroidm1/0004-board-rockchip-ODROID-M1-use-env-in-SPI-use-HK-s-offset-size-for-SPI-env-enable-LED_GPIO-use-preboot-to-blink-all-leds-leave-red-one-on-clear-env-once.patch index bd6d6db74..f4ea3617f 100644 --- a/patch/u-boot/v2023.10/board_odroidm1/0004-board-rockchip-ODROID-M1-use-env-in-SPI-use-HK-s-offset-size-for-SPI-env-enable-LED_GPIO-use-preboot-to-blink-all-leds-leave-red-one-on-clear-env-once.patch +++ b/patch/u-boot/v2023.10/board_odroidm1/0004-board-rockchip-ODROID-M1-use-env-in-SPI-use-HK-s-offset-size-for-SPI-env-enable-LED_GPIO-use-preboot-to-blink-all-leds-leave-red-one-on-clear-env-once.patch @@ -1,16 +1,16 @@ -From bb3fa48c0b803c8d42ad5b38279062ef4cfaa2d6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Fri, 18 Aug 2023 00:40:38 +0200 -Subject: [PATCH 4/4] board: rockchip: ODROID-M1: use env in SPI; use HK's - offset/size for SPI env; enable LED_GPIO; use preboot to blink all leds & - leave red one on; clear env once +Subject: board: rockchip: ODROID-M1: use env in SPI; use HK's offset/size for + SPI env; enable LED_GPIO; use preboot to blink all leds & leave red one on; + clear env once --- configs/odroid-m1-rk3568_defconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/odroid-m1-rk3568_defconfig b/configs/odroid-m1-rk3568_defconfig -index f1dee2e0e24..9b79fb77883 100644 +index f1dee2e0e24a..66bbf424e10c 100644 --- a/configs/odroid-m1-rk3568_defconfig +++ b/configs/odroid-m1-rk3568_defconfig @@ -10,6 +10,8 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y @@ -50,5 +50,5 @@ index f1dee2e0e24..9b79fb77883 100644 CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y -- -2.41.0 +Armbian diff --git a/patch/u-boot/v2023.10/board_radxa-zero2/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2023.10/board_radxa-zero2/meson64-boot-usb-nvme-scsi-first.patch index 4676681e3..004b3c45f 100644 --- a/patch/u-boot/v2023.10/board_radxa-zero2/meson64-boot-usb-nvme-scsi-first.patch +++ b/patch/u-boot/v2023.10/board_radxa-zero2/meson64-boot-usb-nvme-scsi-first.patch @@ -10,7 +10,7 @@ meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and SCSI before S 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index 801cdae4708..927919ef17a 100644 +index 801cdae47081..927919ef17a2 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -74,12 +74,12 @@ diff --git a/patch/u-boot/v2024.01/board_khadas-vim3/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2024.01/board_khadas-vim3/meson64-boot-usb-nvme-scsi-first.patch index 807bfaafd..e6233adef 100644 --- a/patch/u-boot/v2024.01/board_khadas-vim3/meson64-boot-usb-nvme-scsi-first.patch +++ b/patch/u-boot/v2024.01/board_khadas-vim3/meson64-boot-usb-nvme-scsi-first.patch @@ -9,7 +9,7 @@ Subject: meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index efab9a624dc..32c25098e67 100644 +index efab9a624dc5..32c25098e674 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -99,12 +99,12 @@ diff --git a/patch/u-boot/v2024.01/board_khadas-vim3l/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2024.01/board_khadas-vim3l/meson64-boot-usb-nvme-scsi-first.patch index 807bfaafd..e6233adef 100644 --- a/patch/u-boot/v2024.01/board_khadas-vim3l/meson64-boot-usb-nvme-scsi-first.patch +++ b/patch/u-boot/v2024.01/board_khadas-vim3l/meson64-boot-usb-nvme-scsi-first.patch @@ -9,7 +9,7 @@ Subject: meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index efab9a624dc..32c25098e67 100644 +index efab9a624dc5..32c25098e674 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -99,12 +99,12 @@