Commit 573f99c7 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Chen-Yu Tsai
Browse files

Revert "arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection" 

This reverts commit 531fdbee.

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: 531fdbee ("arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection")
Link: https://github.com/LibreELEC/LibreELEC.tv/issues/7731


Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://patch.msgid.link/20250413135848.67283-1-jernej.skrabec@gmail.com


Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
parent 0af2f6be

arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

+19 −19
Original line number Diff line number Diff line
@@ -152,28 +152,12 @@ &pio { 
	vcc-pg-supply = <&reg_aldo1>;

};



&r_ir {

	linux,rc-map-name = "rc-beelink-gs1";

	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 = <&reg_aldo1>;

	 */

	vcc-pm-supply = <&reg_aldo1>;

};



&r_rsb {

&r_i2c {

	status = "okay";



	axp805: pmic@745 {

	axp805: pmic@36 {

		compatible = "x-powers,axp805", "x-powers,axp806";

		reg = <0x745>;

		reg = <0x36>;

		interrupt-parent = <&r_intc>;

		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;

		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 = <&reg_aldo1>;

	 */

	vcc-pm-supply = <&reg_aldo1>;

};



&spdif {

	pinctrl-names = "default";

	pinctrl-0 = <&spdif_tx_pin>;

arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts

+7 −7
Original line number Diff line number Diff line
@@ -176,16 +176,12 @@ &pio { 
	vcc-pg-supply = <&reg_vcc_wifi_io>;

};



&r_ir {

	status = "okay";

};



&r_rsb {

&r_i2c {

	status = "okay";



	axp805: pmic@745 {

	axp805: pmic@36 {

		compatible = "x-powers,axp805", "x-powers,axp806";

		reg = <0x745>;

		reg = <0x36>;

		interrupt-parent = <&r_intc>;

		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;

		interrupt-controller;
@@ -296,6 +292,10 @@ sw { 
	};

};



&r_ir {

	status = "okay";

};



&rtc {

	clocks = <&ext_osc32k>;

};

arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi

+11 −11
Original line number Diff line number Diff line
@@ -113,20 +113,12 @@ &pio { 
	vcc-pg-supply = <&reg_aldo1>;

};



&r_ir {

	status = "okay";

};



&r_pio {

	vcc-pm-supply = <&reg_bldo3>;

};



&r_rsb {

&r_i2c {

	status = "okay";



	axp805: pmic@745 {

	axp805: pmic@36 {

		compatible = "x-powers,axp805", "x-powers,axp806";

		reg = <0x745>;

		reg = <0x36>;

		interrupt-parent = <&r_intc>;

		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;

		interrupt-controller;
@@ -241,6 +233,14 @@ sw { 
	};

};



&r_ir {

	status = "okay";

};



&r_pio {

	vcc-pm-supply = <&reg_bldo3>;

};



&rtc {

	clocks = <&ext_osc32k>;

};