arm: dts: rockchip: rk3288-android delete rk timer

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-p977.dts

diff --git a/arch/arm/boot/dts/rk3288-p977.dts b/arch/arm/boot/dts/rk3288-p977.dts
index 405e3022c5814cc756032db497dc50b7976df213..9818d9dcd536a52ae025976f35c6e1e53e13f836 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-p977.dts
+++ b/arch/arm/boot/dts/rk3288-p977.dts
@@ -108,7 +108,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -124,7 +124,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };              
        };
@@ -134,7 +134,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -492,7 +492,7 @@
 
 &hdmi {
        status = "okay";
-       rockchips,hdmi_audio_source = <0>;
+       rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
 };
 
 &adc {
@@ -611,6 +611,13 @@
                SYS_STATUS_BOOST        324000
                SYS_STATUS_ISP          533000
                >;
+       bd-freq-table = <
+               /* bandwidth   freq */
+               5000           800000
+               3500           456000
+               2600           396000
+               2000           324000
+       >;
        auto-freq-table = <
                240000
                324000
@@ -630,14 +637,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-disabled;
+                               regulator-state-uv = <900000>;
+                       };
                };
 
                rk808_dcdc2_reg: regulator@1 {
                        regulator-name= "vdd_gpu";
+                       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-disabled;
+                               regulator-state-uv = <900000>;
+                       };
                };
 
                rk808_dcdc3_reg: regulator@2 {
@@ -646,6 +671,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 {
@@ -654,6 +686,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 {
@@ -662,6 +701,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 {
@@ -670,6 +714,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 {
@@ -678,6 +727,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 {
@@ -686,6 +740,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 {
@@ -694,6 +753,11 @@
                        regulator-max-microvolt = <3300000>;
                        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 {
@@ -702,6 +766,11 @@
                        regulator-max-microvolt = <1000000>;
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-disabled;
+                               regulator-state-uv = <1000000>;
+                       };
                };
 
                rk808_ldo7_reg: regulator@10 {
@@ -710,6 +779,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 {
@@ -718,18 +792,31 @@
                        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_ldo9_reg: regulator@12 {
                        regulator-name= "rk_ldo9";
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-enabled;
+                       };
                };
 
                rk808_ldo10_reg: regulator@13 {
                        regulator-name= "rk_ldo10";
                        regulator-always-on;
                        regulator-boot-on;
+                       regulator-initial-state = <3>;
+                       regulator-state-mem {
+                               regulator-state-disabled;
+                       };
                };
        };
 };