sun55i: rewrite recent uboot patches

EvilOlaf · igorpecovnik · commit 260f31c5aa83 · 2026-01-31T17:11:58.000+01:00
diff --git a/patch/u-boot/v2026.01/arm64-dts-allwinner-sun55i-a523-add-pcie-spi-combophy.patch b/patch/u-boot/v2026.01/arm64-dts-allwinner-sun55i-a523-add-pcie-spi-combophy.patch
@@ -5,27 +5,22 @@ Subject: arm64: dts: allwinner: sun55i-a523: Add SPI0, PCIe and Combophy nodes
 
 Signed-off-by: Marvin Wewer <mwewer37@proton.me>
 ---
- dts/upstream/src/arm64/allwinner/sun55i-a523.dtsi | 66 ++++++++++
- 1 file changed, 66 insertions(+)
+ dts/upstream/src/arm64/allwinner/sun55i-a523.dtsi | 65 ++++++++++
+ 1 file changed, 65 insertions(+)
 
 diff --git a/dts/upstream/src/arm64/allwinner/sun55i-a523.dtsi b/dts/upstream/src/arm64/allwinner/sun55i-a523.dtsi
 index 111111111111..222222222222 100644
 --- a/dts/upstream/src/arm64/allwinner/sun55i-a523.dtsi
 +++ b/dts/upstream/src/arm64/allwinner/sun55i-a523.dtsi
-@@ -1,9 +1,10 @@
- // SPDX-License-Identifier: (GPL-2.0-only OR MIT)
+@@ -2,6 +2,7 @@
  // Copyright (C) 2023-2024 Arm Ltd.
  
  #include <dt-bindings/interrupt-controller/arm-gic.h>
 +#include <dt-bindings/phy/phy.h>
  #include <dt-bindings/clock/sun6i-rtc.h>
  #include <dt-bindings/clock/sun55i-a523-ccu.h>
  #include <dt-bindings/clock/sun55i-a523-r-ccu.h>
- #include <dt-bindings/reset/sun55i-a523-ccu.h>
- #include <dt-bindings/reset/sun55i-a523-r-ccu.h>
-@@ -607,10 +608,38 @@
- 			clocks = <&r_ccu CLK_BUS_R_PPU1>;
- 			resets = <&r_ccu RST_BUS_R_PPU1>;
+@@ -609,6 +610,34 @@
  			#power-domain-cells = <1>;
  		};
  
@@ -60,11 +55,7 @@ index 111111111111..222222222222 100644
  		r_ccu: clock-controller@7010000 {
  			compatible = "allwinner,sun55i-a523-r-ccu";
  			reg = <0x7010000 0x250>;
- 			clocks = <&osc24M>,
- 				 <&rtc CLK_OSC32K>,
-@@ -624,10 +653,46 @@
- 				      "pll-audio";
- 			#clock-cells = <1>;
+@@ -626,6 +655,42 @@
  			#reset-cells = <1>;
  		};
  
@@ -107,8 +98,6 @@ index 111111111111..222222222222 100644
  		nmi_intc: interrupt-controller@7010320 {
  			compatible = "allwinner,sun55i-a523-nmi";
  			reg = <0x07010320 0xc>;
- 			interrupt-controller;
- 			#interrupt-cells = <2>;
 -- 
 Armbian
 
diff --git a/patch/u-boot/v2026.01/board_orangepi-4a/arm64-dts-sun55i-t527-orangepi-4a-enable-spi0-pcie-combophy.patch b/patch/u-boot/v2026.01/board_orangepi-4a/arm64-dts-sun55i-t527-orangepi-4a-enable-spi0-pcie-combophy.patch
@@ -1,20 +1,19 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Marvin Wewer <mwewer37@proton.me>
 Date: Sun, 4 Jan 2026 21:16:16 +0000
-Subject: arm64: dts: allwinner: sun55i-t527-orangepi-4a: Enable SPI0 and PCIe with ComboPHY
+Subject: arm64: dts: allwinner: sun55i-t527-orangepi-4a: Enable SPI0 and PCIe
+ with ComboPHY
 
 Signed-off-by: Marvin Wewer <mwewer37@proton.me>
 ---
- dts/upstream/src/arm64/allwinner/sun55i-t527-orangepi-4a.dts | 38 ++++++++--
- 1 file changed, 38 insertions(+)
+ dts/upstream/src/arm64/allwinner/sun55i-t527-orangepi-4a.dts | 39 ++++++++++
+ 1 file changed, 39 insertions(+)
 
 diff --git a/dts/upstream/src/arm64/allwinner/sun55i-t527-orangepi-4a.dts b/dts/upstream/src/arm64/allwinner/sun55i-t527-orangepi-4a.dts
 index 111111111111..222222222222 100644
 --- a/dts/upstream/src/arm64/allwinner/sun55i-t527-orangepi-4a.dts
 +++ b/dts/upstream/src/arm64/allwinner/sun55i-t527-orangepi-4a.dts
-@@ -152,10 +152,22 @@
- 	vcc-pg-supply = <&reg_bldo1>;
- 	vcc-ph-supply = <&reg_cldo3>;	/* via VCC-IO */
+@@ -154,6 +154,18 @@
  	vcc-pi-supply = <&reg_cldo3>;
  	vcc-pj-supply = <&reg_cldo1>;
  	vcc-pk-supply = <&reg_cldo1>;
@@ -33,11 +32,7 @@ index 111111111111..222222222222 100644
  };
  
  &r_i2c0 {
- 	status = "okay";
- 
-@@ -368,10 +390,36 @@
- 		host-wakeup-gpios = <&r_pio 1 4 GPIO_ACTIVE_HIGH>; /* PM4 */
- 		shutdown-gpios = <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* PM2 */
+@@ -370,6 +382,32 @@
  	};
  };
  
@@ -70,11 +65,7 @@ index 111111111111..222222222222 100644
  &usb_otg {
  	/*
  	 * The OTG controller is connected to one of the type-A ports.
- 	 * There is a regulator, controlled by a GPIO, to provide VBUS power
- 	 * to the port, and a VBUSDET GPIO, to detect externally provided
-@@ -386,5 +414,6 @@
- 	usb0_vbus-supply = <&reg_otg_vbus>;
- 	usb0_vbus_det-gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
+@@ -388,3 +426,4 @@
  	usb1_vbus-supply = <&reg_usb_vbus>;
  	status = "okay";
  };
diff --git a/patch/u-boot/v2026.01/board_orangepi-4a/edit-orangepi-4a-defconfig.patch b/patch/u-boot/v2026.01/board_orangepi-4a/edit-orangepi-4a-defconfig.patch
@@ -1,7 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Marvin Wewer <mwewer37@proton.me>
 Date: Mon, 12 Jan 2026 13:45:24 +0000
-Subject: Enable PCIe, NVMe, SPI and additional commands in orangepi_4a_defconfig
+Subject: Enable PCIe, NVMe, SPI and additional commands in
+ orangepi_4a_defconfig
 
 Signed-off-by: Marvin Wewer <mwewer37@proton.me>
 ---
@@ -12,9 +13,7 @@ diff --git a/configs/orangepi_4a_defconfig b/configs/orangepi_4a_defconfig
 index 111111111111..222222222222 100644
 --- a/configs/orangepi_4a_defconfig
 +++ b/configs/orangepi_4a_defconfig
-@@ -28,5 +28,25 @@ CONFIG_AXP717_POWER=y
- CONFIG_AXP_I2C_ADDRESS=0x35
- CONFIG_AXP_DCDC2_VOLT=920
+@@ -30,3 +30,23 @@ CONFIG_AXP_DCDC2_VOLT=920
  CONFIG_AXP_DCDC3_VOLT=1160
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_OHCI_HCD=y
diff --git a/patch/u-boot/v2026.01/board_radxa-cubie-a5e/arm64-dts-sun55i-a527-cubie-a5e-enable-spi0-pcie-combophy.patch b/patch/u-boot/v2026.01/board_radxa-cubie-a5e/arm64-dts-sun55i-a527-cubie-a5e-enable-spi0-pcie-combophy.patch
@@ -1,20 +1,19 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Marvin Wewer <mwewer37@proton.me>
 Date: Sat, 25 Oct 2025 16:50:43 +0000
-Subject: arm64: dts: allwinner: sun55i-a527-cubie-a5e: Enable SPI0 and PCIe with ComboPHY
+Subject: arm64: dts: allwinner: sun55i-a527-cubie-a5e: Enable SPI0 and PCIe
+ with ComboPHY
 
 Signed-off-by: Marvin Wewer <mwewer37@proton.me>
 ---
- dts/upstream/src/arm64/allwinner/sun55i-a527-cubie-a5e.dts | 84 ++++++++++
- 1 file changed, 84 insertions(+)
+ dts/upstream/src/arm64/allwinner/sun55i-a527-cubie-a5e.dts | 83 ++++++++++
+ 1 file changed, 83 insertions(+)
 
 diff --git a/dts/upstream/src/arm64/allwinner/sun55i-a527-cubie-a5e.dts b/dts/upstream/src/arm64/allwinner/sun55i-a527-cubie-a5e.dts
 index 111111111111..222222222222 100644
 --- a/dts/upstream/src/arm64/allwinner/sun55i-a527-cubie-a5e.dts
 +++ b/dts/upstream/src/arm64/allwinner/sun55i-a527-cubie-a5e.dts
-@@ -43,10 +43,34 @@
- 		regulator-max-microvolt = <5000000>;
- 		vin-supply = <&reg_vcc5v>;
+@@ -45,6 +45,30 @@
  		gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>;	/* PL8 */
  		enable-active-high;
  	};
@@ -45,11 +44,7 @@ index 111111111111..222222222222 100644
  };
  
  &ehci0 {
- 	status = "okay";
- };
-@@ -102,10 +126,34 @@
- 	vcc-pg-supply = <&reg_bldo1>;
- 	vcc-ph-supply = <&reg_cldo3>;	/* via VCC-IO */
+@@ -104,6 +128,30 @@
  	vcc-pi-supply = <&reg_cldo3>;
  	vcc-pj-supply = <&reg_cldo4>;
  	vcc-pk-supply = <&reg_cldo1>;
@@ -80,11 +75,7 @@ index 111111111111..222222222222 100644
  };
  
  &r_i2c0 {
- 	status = "okay";
- 
-@@ -280,18 +328,53 @@
-  * Specifying the supply would create a circular dependency.
-  *
+@@ -282,6 +330,14 @@
   *	vcc-pl-supply = <&reg_aldo3>;
   */
  	vcc-pm-supply = <&reg_aldo3>;
@@ -99,8 +90,7 @@ index 111111111111..222222222222 100644
  };
  
  &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_pb_pins>;
+@@ -290,6 +346,33 @@
  	status = "okay";
  };
  
@@ -134,8 +124,6 @@ index 111111111111..222222222222 100644
  &usb_otg {
  	/*
  	 * The USB-C port is the primary power supply, so in this configuration
- 	 * relies on the other end of the USB cable to supply the VBUS power.
- 	 * So use this port in peripheral mode.
 -- 
 Armbian
 
diff --git a/patch/u-boot/v2026.01/board_radxa-cubie-a5e/edit-radxa-cubie-a5e-defconfig.patch b/patch/u-boot/v2026.01/board_radxa-cubie-a5e/edit-radxa-cubie-a5e-defconfig.patch
@@ -5,16 +5,14 @@ Subject: Enable PCIe, NVMe, SPI and GPIO support in radxa-cubie-a5e_defconfig
 
 Signed-off-by: Marvin Wewer <mwewer37@proton.me>
 ---
- configs/radxa-cubie-a5e_defconfig | 55 ++++++++++
- 1 file changed, 55 insertions(+)
+ configs/radxa-cubie-a5e_defconfig | 20 ++++++++++
+ 1 file changed, 20 insertions(+)
 
 diff --git a/configs/radxa-cubie-a5e_defconfig b/configs/radxa-cubie-a5e_defconfig
 index 111111111111..222222222222 100644
 --- a/configs/radxa-cubie-a5e_defconfig
 +++ b/configs/radxa-cubie-a5e_defconfig
-@@ -28,5 +28,25 @@ CONFIG_REGULATOR_AXP=y
- CONFIG_AXP717_POWER=y
- CONFIG_AXP_DCDC2_VOLT=920
+@@ -30,3 +30,23 @@ CONFIG_AXP_DCDC2_VOLT=920
  CONFIG_AXP_DCDC3_VOLT=1100
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_OHCI_HCD=y
diff --git a/patch/u-boot/v2026.01/clk-sunxi-add-sun55i-a523-pcie-usb3-clocks.patch b/patch/u-boot/v2026.01/clk-sunxi-add-sun55i-a523-pcie-usb3-clocks.patch
@@ -13,9 +13,7 @@ diff --git a/drivers/clk/sunxi/clk_a523.c b/drivers/clk/sunxi/clk_a523.c
 index 111111111111..222222222222 100644
 --- a/drivers/clk/sunxi/clk_a523.c
 +++ b/drivers/clk/sunxi/clk_a523.c
-@@ -44,10 +44,12 @@ static struct ccu_clk_gate a523_gates[] = {
- 	[CLK_BUS_OHCI0]		= GATE(0xa8c, BIT(0)),
- 	[CLK_BUS_OHCI1]		= GATE(0xa8c, BIT(1)),
+@@ -46,6 +46,8 @@ static struct ccu_clk_gate a523_gates[] = {
  	[CLK_BUS_EHCI0]		= GATE(0xa8c, BIT(4)),
  	[CLK_BUS_EHCI1]		= GATE(0xa8c, BIT(5)),
  	[CLK_BUS_OTG]		= GATE(0xa8c, BIT(8)),
@@ -24,27 +22,19 @@ index 111111111111..222222222222 100644
  };
  
  static struct ccu_reset a523_resets[] = {
- 	[RST_BUS_MMC0]		= RESET(0x84c, BIT(16)),
- 	[RST_BUS_MMC1]		= RESET(0x84c, BIT(17)),
-@@ -73,10 +75,11 @@ static struct ccu_reset a523_resets[] = {
- 	[RST_BUS_OHCI0]		= RESET(0xa8c, BIT(16)),
- 	[RST_BUS_OHCI1]		= RESET(0xa8c, BIT(17)),
+@@ -75,6 +77,7 @@ static struct ccu_reset a523_resets[] = {
  	[RST_BUS_EHCI0]		= RESET(0xa8c, BIT(20)),
  	[RST_BUS_EHCI1]		= RESET(0xa8c, BIT(21)),
  	[RST_BUS_OTG]		= RESET(0xa8c, BIT(24)),
 +	[RST_BUS_PCIE_USB3]	= RESET(0xaac, BIT(24)),
  };
  
  const struct ccu_desc a523_ccu_desc = {
- 	.gates	= a523_gates,
- 	.resets	= a523_resets,
 diff --git a/dts/upstream/include/dt-bindings/clock/sun55i-a523-ccu.h b/dts/upstream/include/dt-bindings/clock/sun55i-a523-ccu.h
 index 111111111111..222222222222 100644
 --- a/dts/upstream/include/dt-bindings/clock/sun55i-a523-ccu.h
 +++ b/dts/upstream/include/dt-bindings/clock/sun55i-a523-ccu.h
-@@ -183,7 +183,8 @@
- #define CLK_FANOUT_27M		174
- #define CLK_FANOUT_PCLK		175
+@@ -185,5 +185,6 @@
  #define CLK_FANOUT0		176
  #define CLK_FANOUT1		177
  #define CLK_FANOUT2		178
diff --git a/patch/u-boot/v2026.01/pcie-sunxi-add-dw-pcie-support-for-sun55i.patch b/patch/u-boot/v2026.01/pcie-sunxi-add-dw-pcie-support-for-sun55i.patch
@@ -16,9 +16,7 @@ diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
 index 111111111111..222222222222 100644
 --- a/drivers/pci/Kconfig
 +++ b/drivers/pci/Kconfig
-@@ -462,6 +462,14 @@ config PCIE_DW_IMX
- 	select SYSCON
- 	help
+@@ -464,4 +464,12 @@ config PCIE_DW_IMX
  	  Say Y here if you want to enable DW PCIe controller support on
  	  iMX SoCs.
  
@@ -35,9 +33,7 @@ diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
 index 111111111111..222222222222 100644
 --- a/drivers/pci/Makefile
 +++ b/drivers/pci/Makefile
-@@ -55,5 +55,6 @@ obj-$(CONFIG_PCIE_DW_SIFIVE) += pcie_dw_sifive.o
- obj-$(CONFIG_PCIE_UNIPHIER) += pcie_uniphier.o
- obj-$(CONFIG_PCIE_XILINX_NWL) += pcie-xilinx-nwl.o
+@@ -57,3 +57,4 @@ obj-$(CONFIG_PCIE_XILINX_NWL) += pcie-xilinx-nwl.o
  obj-$(CONFIG_PCIE_PLDA_COMMON) += pcie_plda_common.o
  obj-$(CONFIG_PCIE_STARFIVE_JH7110) += pcie_starfive_jh7110.o
  obj-$(CONFIG_PCIE_DW_IMX) += pcie_dw_imx.o
diff --git a/patch/u-boot/v2026.01/phy-allwinner-add-pcie-usb3-driver.patch b/patch/u-boot/v2026.01/phy-allwinner-add-pcie-usb3-driver.patch
@@ -14,9 +14,7 @@ diff --git a/drivers/phy/allwinner/Kconfig b/drivers/phy/allwinner/Kconfig
 index 111111111111..222222222222 100644
 --- a/drivers/phy/allwinner/Kconfig
 +++ b/drivers/phy/allwinner/Kconfig
-@@ -31,5 +31,13 @@ config PHY_SUN50I_USB3
- 	depends on ARCH_SUNXI
- 	select PHY
+@@ -33,3 +33,11 @@ config PHY_SUN50I_USB3
  	help
  	  Enable this to support the USB3 transceiver that is part of
  	  Allwinner sun50i SoCs.
@@ -32,9 +30,7 @@ diff --git a/drivers/phy/allwinner/Makefile b/drivers/phy/allwinner/Makefile
 index 111111111111..222222222222 100644
 --- a/drivers/phy/allwinner/Makefile
 +++ b/drivers/phy/allwinner/Makefile
-@@ -3,5 +3,6 @@
- # Copyright (C) 2016 Amarula Solutions
- #
+@@ -5,3 +5,4 @@
  
  obj-$(CONFIG_PHY_SUN4I_USB)		+= phy-sun4i-usb.o
  obj-$(CONFIG_PHY_SUN50I_USB3)		+= phy-sun50i-usb3.o
diff --git a/patch/u-boot/v2026.01/spi-sunxi-add-sun55i-a523-spl-support.patch b/patch/u-boot/v2026.01/spi-sunxi-add-sun55i-a523-spl-support.patch
diff --git a/patch/u-boot/v2026.01/spi-sunxi-add-sun55i-a523-support.patch b/patch/u-boot/v2026.01/spi-sunxi-add-sun55i-a523-support.patch
diff --git a/patch/u-boot/v2026.01/sunxi-add-nvme-boot-target.patch b/patch/u-boot/v2026.01/sunxi-add-nvme-boot-target.patch
