]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'sunxi/sunxi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Apr 2021 23:41:26 +0000 (09:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Apr 2021 23:41:26 +0000 (09:41 +1000)
1  2 
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

index 4c462711f26c51051bbaeb98e8ac30b512f83dec,fb88c9d56ceccb59d071b3c6c5f21ae27a806d80..43aa631896487097a73c385ad498c677602c9488
        };
  };
  
- &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";
  };