pmic: modify pmic setup for tinker board device

Change-Id: I50c5f0fba871c7648140003692bce9bc9e3feff6

Author: Andy3Kuo

arch/arm/boot/dts/rk3288-tinker-board.dts

@@ -285,7 +285,7 @@
 	backlight = <&backlight>;
 	enable-delay-ms = <120>;
 	pinctrl-0 = <&lcd_cs>;
-	power-supply = <&vcc_lcd>;
+	power-supply = <&vcc33_lan>;
 	status = "okay";
 
 	display-timings {
@@ -406,7 +406,8 @@
 				regulator-name = "vdd_gpu";
 				regulator-ramp-delay = <6000>;
 				regulator-state-mem {
-					regulator-off-in-suspend;
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
 				};
 			};
 
@@ -431,24 +432,24 @@
 				};
 			};
 
-			vcc_tp: LDO_REG1 {
+			vcc18_ldo1: LDO_REG1 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcc_tp";
+				regulator-name = "vcc18_ldo1";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <1800000>;
 				};
 			};
 
-			vcca_codec: LDO_REG2 {
+			vcc33_mipi: LDO_REG2 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
-				regulator-name = "vcca_codec";
+				regulator-name = "vcc33_mipi";
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
@@ -466,14 +467,15 @@
 				};
 			};
 
-			vcc_wl: LDO_REG4 {
+			vcc18_codec: LDO_REG4 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-name = "vcc_wl";
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc18_codec";
 				regulator-state-mem {
 					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
 				};
 			};
 
@@ -496,7 +498,8 @@
 				regulator-max-microvolt = <1000000>;
 				regulator-name = "vdd10_lcd";
 				regulator-state-mem {
-					regulator-off-in-suspend;
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
 				};
 			};
 
@@ -519,29 +522,25 @@
 				regulator-max-microvolt = <1800000>;
 				regulator-name = "vcc18_lcd";
 				regulator-state-mem {
-					regulator-off-in-suspend;
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
 				};
 			};
 
-			vcc_sd: SWITCH_REG1 {
-				regulator-always-on;
+			vcc33_sd: SWITCH_REG1 {
 				regulator-boot-on;
-				regulator-min-microvolt = <3300000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-name = "vcc_sd";
+				regulator-name = "vcc33_sd";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 				};
 			};
 
-			vcc_lcd: SWITCH_REG2 {
+			vcc33_lan: SWITCH_REG2 {
 				regulator-always-on;
 				regulator-boot-on;
-				regulator-min-microvolt = <3300000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-name = "vcc_lcd";
+				regulator-name = "vcc33_lan";
 				regulator-state-mem {
-					regulator-off-in-suspend;
+					regulator-on-in-suspend;
 				};
 			};
 		};
@@ -606,13 +605,13 @@
 	audio-supply = <&vcc_io>;
 	bb-supply = <&vcc_io>;
 	dvp-supply = <&vcc18_dvp>;
-	flash0-supply = <&vcc_18>;
+	flash0-supply = <&vcc_flash>;
 	flash1-supply = <&vcc_io>;
 	gpio30-supply = <&vcc_io>;
 	gpio1830 = <&vcc_io>;
-	lcdc-supply = <&vcc_lcd>;
+	lcdc-supply = <&vcc33_lan>;
 	sdcard-supply = <&vccio_sd>;
-	wifi-supply = <&vcc_wl>;
+	wifi-supply = <&vcc_18>;
 };
 
 &i2c2 {

arch/arm/boot/dts/rk3288-tinker-board.dtsi

@@ -155,6 +155,14 @@
 		vin-supply = <&vcc_io>;
 	};
 
+	vcc_flash: flash-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_flash";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vcc_io>;
+	};
+
 	wireless-bluetooth {
 		compatible = "bluetooth-platdata";
 		uart_rts_gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
@@ -194,7 +202,7 @@
 };
 
 &gmac {
-	phy-supply = <&vcc_phy>;
+	phy-supply = <&vcc33_lan>;
 	phy-mode = "rgmii";
 	clock_in_out = "input";
 	snps,reset-gpio = <&gpio4 7 0>;
@@ -217,7 +225,7 @@
 };
 
 &saradc {
-	vref-supply = <&vccadc_ref>;
+	vref-supply = <&vcc18_ldo1>;
 	status = "okay";
 };
 
@@ -236,7 +244,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
 	status = "okay";
-	vmmc-supply = <&vcc_sd>;
+	vmmc-supply = <&vcc33_sd>;
 	vqmmc-supply = <&vccio_sd>;
 	supports-sd;
 };