From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Apr 2021 23:41:26 +0000 (+1000)
Subject: Merge remote-tracking branch 'sunxi/sunxi/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1591c95fab9e9f96122c7314c31bf865fe233c3f;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'sunxi/sunxi/for-next'
---

1591c95fab9e9f96122c7314c31bf865fe233c3f
diff --cc arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
index 4c462711f26c,fb88c9d56cec..43aa63189648
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
@@@ -289,26 -289,22 +289,38 @@@
  	};
  };
  
- &rtc {
- 	clocks = <&ext_osc32k>;
+ &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>;
  };
  
 +&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 {
  	status = "okay";
  };