From: Matrix Screen Controller maintainers
Subject: [PATCH] arm64: dts: walnutpi: describe AXP313A on eMMC variant

The vendor eMMC board DTS duplicates the PMIC description instead of
including the non-eMMC board DTS.  Apply the same AXP313A regulator mapping
to both variants so either boot-device layout gets the cpufreq and rail
safety fix.

---
 .../sun50i-h616-walnutpi-1b-emmc.dts          | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-walnutpi-1b-emmc.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-walnutpi-1b-emmc.dts
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-walnutpi-1b-emmc.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-walnutpi-1b-emmc.dts
@@ -306,32 +306,32 @@
 &r_i2c {
 	status = "okay";
 
-	axp305: pmic@36 {
-		compatible = "x-powers,axp305", "x-powers,axp805",
-			     "x-powers,axp806";
+	axp313a: pmic@36 {
+		compatible = "x-powers,axp313a";
 		interrupt-controller;
 		#interrupt-cells = <1>;
 		reg = <0x36>;
 
-		x-powers,self-working-mode;
-		vina-supply = <&reg_vcc5v>;
-		vinb-supply = <&reg_vcc5v>;
-		vinc-supply = <&reg_vcc5v>;
-		vind-supply = <&reg_vcc5v>;
-		vine-supply = <&reg_vcc5v>;
-		aldoin-supply = <&reg_vcc5v>;
-		bldoin-supply = <&reg_vcc5v>;
-		cldoin-supply = <&reg_vcc5v>;
+		vin1-supply = <&reg_vcc5v>;
+		vin2-supply = <&reg_vcc5v>;
+		vin3-supply = <&reg_vcc5v>;
 
 		regulators {
 
-			reg_bldo1: bldo1 {
+			reg_bldo1: aldo1 {
 				regulator-always-on;
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-name = "vcc1v8";
 			};
 
+			reg_dldo1: dldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc3v3";
+			};
+
 			reg_dcdc2: dcdc2 {
 				regulator-always-on;
 				regulator-min-microvolt = <810000>;
@@ -348,15 +348,11 @@
 
 			reg_dcdc3: dcdc3 {
 				regulator-always-on;
-				regulator-min-microvolt = <1300000>;
-				regulator-max-microvolt = <1300000>;
+				regulator-min-microvolt = <1100000>;
+				regulator-max-microvolt = <1100000>;
 				regulator-name = "vdd-dram";
 			};
 
-	
-			sw {
-				/* unused */
-			};
 		};
 	};
 };
-- 
2.39.2