From 1b26cdcdc0e91ddc6f156b2ff2b3dfbcb5025c8b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 5 Jun 2025 08:23:48 +0000 Subject: [PATCH] Part Revert "Allwinner: linux: Switch PMIC connection to I2C" This part reverts commit 1dc9fcdd33e78598687d74d4dbf9e2bb61050464. --- ...-allwinner-h6-Use-RSB-for-AXP805-PMI.patch | 160 ------------------ 1 file changed, 160 deletions(-) delete mode 100644 projects/Allwinner/patches/linux/0000-Revert-arm64-dts-allwinner-h6-Use-RSB-for-AXP805-PMI.patch diff --git a/projects/Allwinner/patches/linux/0000-Revert-arm64-dts-allwinner-h6-Use-RSB-for-AXP805-PMI.patch b/projects/Allwinner/patches/linux/0000-Revert-arm64-dts-allwinner-h6-Use-RSB-for-AXP805-PMI.patch deleted file mode 100644 index 2e6bc06289..0000000000 --- a/projects/Allwinner/patches/linux/0000-Revert-arm64-dts-allwinner-h6-Use-RSB-for-AXP805-PMI.patch +++ /dev/null @@ -1,160 +0,0 @@ -From af06c77bfb2e552ab8815aae7856bed29cf8424d Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Sat, 15 Mar 2025 09:57:57 +0100 -Subject: [PATCH] Revert "arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC - connection" - -This reverts commit 531fdbeedeb89bd32018a35c6e137765c9cc9e97. - -Hardware that uses I2C wasn't designed with high speeds in mind, so -communication with PMIC via RSB can intermittently fail. Go back to I2C -as higher speed and efficiency isn't worth the trouble. - -Fixes: 531fdbeedeb8 ("arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection") -Signed-off-by: Jernej Skrabec ---- - .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 38 +++++++++---------- - .../dts/allwinner/sun50i-h6-orangepi-3.dts | 14 +++---- - .../dts/allwinner/sun50i-h6-orangepi.dtsi | 22 +++++------ - 3 files changed, 37 insertions(+), 37 deletions(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts -index 13a0e63afeaf..2c64d834a2c4 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts -@@ -152,28 +152,12 @@ &pio { - vcc-pg-supply = <®_aldo1>; - }; - --&r_ir { -- linux,rc-map-name = "rc-beelink-gs1"; -+&r_i2c { - status = "okay"; --}; - --&r_pio { -- /* -- * FIXME: We can't add that supply for now since it would -- * create a circular dependency between pinctrl, the regulator -- * and the RSB Bus. -- * -- * vcc-pl-supply = <®_aldo1>; -- */ -- vcc-pm-supply = <®_aldo1>; --}; -- --&r_rsb { -- status = "okay"; -- -- axp805: pmic@745 { -+ axp805: pmic@36 { - compatible = "x-powers,axp805", "x-powers,axp806"; -- reg = <0x745>; -+ reg = <0x36>; - interrupt-parent = <&r_intc>; - interrupts = ; - interrupt-controller; -@@ -291,6 +275,22 @@ sw { - }; - }; - -+&r_ir { -+ linux,rc-map-name = "rc-beelink-gs1"; -+ status = "okay"; -+}; -+ -+&r_pio { -+ /* -+ * PL0 and PL1 are used for PMIC I2C -+ * don't enable the pl-supply else -+ * it will fail at boot -+ * -+ * vcc-pl-supply = <®_aldo1>; -+ */ -+ vcc-pm-supply = <®_aldo1>; -+}; -+ - &spdif { - pinctrl-names = "default"; - pinctrl-0 = <&spdif_tx_pin>; -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts -index ab87c3447cd7..f005072c68a1 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts -@@ -176,16 +176,12 @@ &pio { - vcc-pg-supply = <®_vcc_wifi_io>; - }; - --&r_ir { -+&r_i2c { - status = "okay"; --}; - --&r_rsb { -- status = "okay"; -- -- axp805: pmic@745 { -+ axp805: pmic@36 { - compatible = "x-powers,axp805", "x-powers,axp806"; -- reg = <0x745>; -+ reg = <0x36>; - interrupt-parent = <&r_intc>; - interrupts = ; - interrupt-controller; -@@ -296,6 +292,10 @@ sw { - }; - }; - -+&r_ir { -+ status = "okay"; -+}; -+ - &rtc { - clocks = <&ext_osc32k>; - }; -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi -index d05dc5d6e6b9..e34dbb992021 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi -@@ -113,20 +113,12 @@ &pio { - vcc-pg-supply = <®_aldo1>; - }; - --&r_ir { -+&r_i2c { - status = "okay"; --}; - --&r_pio { -- vcc-pm-supply = <®_bldo3>; --}; -- --&r_rsb { -- status = "okay"; -- -- axp805: pmic@745 { -+ axp805: pmic@36 { - compatible = "x-powers,axp805", "x-powers,axp806"; -- reg = <0x745>; -+ reg = <0x36>; - interrupt-parent = <&r_intc>; - interrupts = ; - interrupt-controller; -@@ -241,6 +233,14 @@ sw { - }; - }; - -+&r_ir { -+ status = "okay"; -+}; -+ -+&r_pio { -+ vcc-pm-supply = <®_bldo3>; -+}; -+ - &rtc { - clocks = <&ext_osc32k>; - }; --- -2.48.1 -