projects / firefly-linux-kernel-4.4.55.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ARM: dts: rockchip: fix i2s&spdif interrupts on rk3288
[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-chrome.dts
diff --git a/arch/arm/boot/dts/rk3288-chrome.dts b/arch/arm/boot/dts/rk3288-chrome.dts
index c671aaacf1e00574db78f6cab9405cde0ce58a66..5b6723f2c958503d760a298e963e1c1aad6eaf1b 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-chrome.dts
+++ b/arch/arm/boot/dts/rk3288-chrome.dts
@@ -92,7 +92,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -108,7 +108,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -118,7 +118,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -134,7 +134,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -144,7 +144,7 @@
                        };
                        dai1 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "dsp_a";
                                //continuous-clock;
                                bitclock-inversion;
@@ -196,11 +196,15 @@
 };
 
 &emmc {
-               clock-frequency = <200000000>;
-               clock-freq-min-max = <400000 200000000>;
+       clock-frequency = <150000000>;
+       clock-freq-min-max = <400000 150000000>;
         supports-highspeed;
-               supports-emmc;
-               bootpart-no-access;
+       supports-emmc;
+       bootpart-no-access;
+
+       supports-DDR_MODE;
+       caps2-mmc-hs200;
+
         ignore-pm-notify;
                keep-power-in-suspend;
        status = "okay";
@@ -213,6 +217,10 @@
                supports-sd;
                broken-cd;
                card-detect-delay = <200>;
+               
+               ignore-pm-notify;
+               keep-power-in-suspend;
+               
                vmmc-supply = <&rk808_ldo5_reg>;
                status = "okay";
 };
@@ -468,12 +476,14 @@
         display-timings = <&disp_timings>;
 };
 
-/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
-&lcdc1 {
+/*lcdc0 as PRMRY(LCD),lcdc1 as EXTEND(HDMI)*/
+&lcdc0 {
        status = "okay";
+       rockchip,mirror = <NO_MIRROR>;
+       rockchip,cabc_mode = <0>;
+       rockchip,iommu-enabled = <0>;
        power_ctr: power_ctr {
                rockchip,debug = <0>;
-               rockchip,mirror = <NO_MIRROR>;
                lcd_en:lcd_en {
                        rockchip,power_type = <GPIO>;
                        gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;
@@ -481,7 +491,7 @@
                };
                
                lcd_cs:lcd_cs {
-rockchip,power_type = <GPIO>;
+                       rockchip,power_type = <GPIO>;
                        gpios = <&gpio7 GPIO_A4 GPIO_ACTIVE_HIGH>;
                        rockchip,delay = <10>;
                };
@@ -495,8 +505,10 @@ rockchip,power_type = <GPIO>;
        };
 };
 
-&lcdc0 {
+&lcdc1 {
        status = "okay";
+       rockchip,mirror = <NO_MIRROR>;
+       rockchip,iommu-enabled = <0>;
 };
 
 &hdmi {
@@ -635,14 +647,32 @@ rockchip,power_type = <GPIO>;
                
                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 {
@@ -651,6 +681,13 @@ rockchip,power_type = <GPIO>;
                        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 {
@@ -659,6 +696,13 @@ rockchip,power_type = <GPIO>;
                        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 {
@@ -667,6 +711,11 @@ rockchip,power_type = <GPIO>;
                        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 {
@@ -675,6 +724,11 @@ rockchip,power_type = <GPIO>;
                        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 {
@@ -683,6 +737,11 @@ rockchip,power_type = <GPIO>;
                        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 {
@@ -691,6 +750,11 @@ rockchip,power_type = <GPIO>;
                        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 {
@@ -699,6 +763,11 @@ rockchip,power_type = <GPIO>;
                        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 {
@@ -707,6 +776,11 @@ rockchip,power_type = <GPIO>;
                        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 {
@@ -715,6 +789,11 @@ rockchip,power_type = <GPIO>;
                        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 {
@@ -723,18 +802,31 @@ rockchip,power_type = <GPIO>;
                        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;
+                       };
                };
        };
 };
Unnamed repository; edit this file 'description' to name the repository.