Unverified Commit 4e3d2c4b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-6.15' of... 

Merge tag 'sunxi-fixes-for-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Allwinner fixes for 6.15

Only one fix:

Switch back to I2C for PMICs on Allwinner H6 devices. Apparently using
Allwinner's proprietary bus ended up causing issues when the PMIC was
sharing the bus with other devices.

* tag 'sunxi-fixes-for-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  Revert "arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection"

Link: https://lore.kernel.org/r/aCaeLgjZllV7bauX@wens.tw


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6c9ab811 573f99c7

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>;

};