arm: dts: rk3288-evb: modify panel to edp_panel

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3188-tb.dts

diff --git a/arch/arm/boot/dts/rk3188-tb.dts b/arch/arm/boot/dts/rk3188-tb.dts
old mode 100755 (executable)
new mode 100644 (file)
index 533ce59..d091770
--- a/arch/arm/boot/dts/rk3188-tb.dts
+++ b/arch/arm/boot/dts/rk3188-tb.dts
@@ -97,7 +97,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -113,7 +113,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rk610_codec>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -129,7 +129,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -142,6 +142,12 @@
 
        rockchip-hdmi-spdif {
                compatible = "rockchip-hdmi-spdif";
+               dais {
+                       dai0 {
+                               audio-codec = <&codec_hdmi_spdif>;
+                               audio-controller = <&spdif>;
+                       };
+               };
        };
 
        vmac-phy {
@@ -512,86 +518,91 @@
 
                dcdc2_reg: regulator@1 {
                        regulator-name= "vdd_logic";
-                       regulator-always-on;
-                       regulator-boot-on;                      
+                       regulator-min-microvolt = <700000>;
+                       regulator-max-microvolt = <1500000>;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                               regulator-state-uv = <1200000>;
+                       };                      
                };
 
                dcdc3_reg: regulator@2 {
                        regulator-name= "vdd_arm";
-                       regulator-always-on;
-                       regulator-boot-on;
+                       regulator-min-microvolt = <700000>;
+                       regulator-max-microvolt = <1500000>;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                               regulator-state-uv = <1200000>;
+                       };
                };
 
                dcdc4_reg: regulator@3 {
                        regulator-name= "vccio";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                               regulator-state-uv = <3300000>;
+                       };
                };
 
                ldo1_reg: regulator@4 {
                        regulator-name= "act_ldo1";
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
+               
                };
 
                ldo2_reg: regulator@5 {
                        regulator-name= "act_ldo2";
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
-                       regulator-always-on;
-                       regulator-boot-on;
+               
                };
 
                ldo3_reg: regulator@6 {
                        regulator-name= "act_ldo3";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-                       regulator-boot-on;
+                       
                };
 
                ldo4_reg:regulator@7 {
                        regulator-name= "act_ldo4";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
+                       
                };
 
                ldo5_reg: regulator@8 {
                        regulator-name= "act_ldo5";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
+               
                };
 
                ldo6_reg: regulator@9 {
                        regulator-name= "act_ldo6";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
+               
                };
 
                ldo7_reg: regulator@10 {
                        regulator-name= "act_ldo7";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-                       regulator-boot-on;
+               
                };
 
                ldo8_reg: regulator@11 {
                        regulator-name= "act_ldo8";
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
-                       regulator-always-on;
-                       regulator-boot-on;
+               
                };
        };
 };
@@ -604,14 +615,32 @@
                
                rk808_dcdc1_reg: regulator@0{
                        regulator-name= "vdd_arm";      
+                       regulator-min-microvolt = <700000>;
+                       regulator-max-microvolt = <1500000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-mode = <0x2>;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-mode = <0x2>;
+                               regulator-state-enabled;
+                               regulator-state-uv = <900000>;
+                       };
                };
 
                rk808_dcdc2_reg: regulator@1 {
                        regulator-name= "vdd_logic";
+                       regulator-min-microvolt = <700000>;
+                       regulator-max-microvolt = <1500000>;
                        regulator-always-on;
                        regulator-boot-on;              
+                       regulator-initial-mode = <0x2>;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-mode = <0x2>;
+                               regulator-state-enabled;
+                               regulator-state-uv = <900000>;
+                       };
                };
 
                rk808_dcdc3_reg: regulator@2 {
@@ -620,6 +649,13 @@
                        regulator-max-microvolt = <1200000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-mode = <0x2>;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-mode = <0x2>;
+                               regulator-state-enabled;
+                               regulator-state-uv = <1200000>;
+                       };
                };
 
                rk808_dcdc4_reg: regulator@3 {
@@ -628,6 +664,13 @@
                        regulator-max-microvolt = <3300000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-mode = <0x2>;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-mode = <0x2>;
+                               regulator-state-enabled;
+                               regulator-state-uv = <2800000>;
+                       };
                };
 
                rk808_ldo1_reg: regulator@4 {
@@ -636,6 +679,11 @@
                        regulator-max-microvolt = <3300000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                               regulator-state-uv = <3300000>;
+                       };
                };
 
                rk808_ldo2_reg: regulator@5 {
@@ -644,6 +692,11 @@
                        regulator-max-microvolt = <3300000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                               regulator-state-uv = <3300000>;
+                       };
                };
 
                rk808_ldo3_reg: regulator@6 {
@@ -652,6 +705,11 @@
                        regulator-max-microvolt = <1000000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                               regulator-state-uv = <1000000>;
+                       };
                };
 
                rk808_ldo4_reg:regulator@7 {
@@ -660,6 +718,11 @@
                        regulator-max-microvolt = <1800000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-disabled;
+                               regulator-state-uv = <1800000>;
+                       };
                };
 
                rk808_ldo5_reg: regulator@8 {
@@ -668,6 +731,11 @@
                        regulator-max-microvolt = <2800000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                               regulator-state-uv = <2800000>;
+                       };
                };
 
                rk808_ldo6_reg: regulator@9 {
@@ -676,6 +744,11 @@
                        regulator-max-microvolt = <1200000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-disabled;
+                               regulator-state-uv = <1200000>;
+                       };
                };
 
                rk808_ldo7_reg: regulator@10 {
@@ -684,6 +757,11 @@
                        regulator-max-microvolt = <1800000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                               regulator-state-uv = <1800000>;
+                       };
                };
 
                rk808_ldo8_reg: regulator@11 {
@@ -692,6 +770,11 @@
                        regulator-max-microvolt = <1800000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                               regulator-state-uv = <1800000>;
+                       };
                };
        };
 };