Revert "open display kernel log in uboot,just support lvds now"

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

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index 1acfe75a5f32251139dbb5c3a3e7e9b10a2765d4..2f92b7ec099bd973bd90bc9c316a9f7011d0c839 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -109,14 +109,8 @@
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
                                i2s-controller = <&spdif>;
-                               format = "spdif";
-                               //continuous-clock;
-                               //bitclock-inversion;
-                               //frame-inversion;
-                               //bitclock-master;
-                               //frame-master;
                        };
-               };              
+               };
        };
 
        rockchip-rt5631 {
@@ -151,9 +145,9 @@
                        dai1 {
                                audio-codec = <&rt3261>;
                                i2s-controller = <&i2s>;
-                               format = "i2s";
+                               format = "dsp_a";
                                //continuous-clock;
-                               //bitclock-inversion;
+                               bitclock-inversion;
                                //frame-inversion;
                                //bitclock-master;
                                //frame-master;
@@ -219,6 +213,8 @@
                clock-freq-min-max = <200000 50000000>;
                supports-highspeed;
                supports-sdio;
+               ignore-pm-notify;
+               keep-power-in-suspend;
                //cap-sdio-irq;
                status = "okay";
 };
@@ -300,7 +296,7 @@
 
 &uart_bt {
         status = "okay";
-        dma-names = "tx", "rx";
+        dma-names = "!tx", "!rx";
         pinctrl-0 = <&uart0_xfer &uart0_cts>;
 };
 
@@ -538,7 +534,7 @@ rockchip,power_type = <GPIO>;
                };
 
                menu-key {
-                       linux,code = <139>;
+                       linux,code = <59>;
                        label = "menu";
                        rockchip,adc_value = <355>;
                };
@@ -575,14 +571,18 @@ rockchip,power_type = <GPIO>;
 &clk_core_dvfs_table {
        operating-points = <
                /* KHz    uV */
+               126000 850000
+               216000 850000
                312000 850000
-               504000 850000
+               408000 850000
+               600000 850000
+               696000 900000
                816000 950000
                1008000 1000000
                1200000 1050000
                1416000 1150000
-               1608000 1250000
                >;
+       status="okay";
 };
 
 &clk_gpu_dvfs_table {
@@ -592,16 +592,19 @@ rockchip,power_type = <GPIO>;
                200000 850000
                300000 900000
                400000 1000000
+               500000 1100000
                600000 1250000
                >;
+       status="okay";
 };
 
 &clk_ddr_dvfs_table {
        operating-points = <
                /* KHz    uV */
-               200000 1200000
-               300000 1200000
-               400000 1200000
+               200000 950000
+               300000 950000
+               400000 1000000
+               533000 1050000
                >;
 
        freq_table = <
@@ -611,6 +614,7 @@ rockchip,power_type = <GPIO>;
                SYS_STATUS_VIDEO        300000
                SYS_STATUS_DUALVIEW     500000
                >;
+       status="okay";
 };
 
 /include/ "rk808.dtsi"
@@ -681,8 +685,8 @@ rockchip,power_type = <GPIO>;
                };
 
                rk808_ldo5_reg: regulator@8 {
-                       regulator-name= "rk_ldo5";
-                       regulator-min-microvolt = <3300000>;
+                       regulator-name= "vcc_sd";
+                       regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <3300000>;
                        regulator-always-on;
                        regulator-boot-on;
@@ -711,5 +715,49 @@ rockchip,power_type = <GPIO>;
                        regulator-always-on;
                        regulator-boot-on;
                };
+
+               rk808_ldo9_reg: regulator@12 {
+                       regulator-name= "rk_ldo9";
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               rk808_ldo10_reg: regulator@13 {
+                       regulator-name= "rk_ldo10";
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
        };
 };
+
+&lcdc_vdd_domain {
+       regulator-name = "vcc30_lcd";
+       };
+&dpio_vdd_domain{
+       regulator-name = "vcc18_cif";   
+       };
+&flash0_vdd_domain{
+       regulator-name = "vcc_flash";   
+       };
+&flash1_vdd_domain{
+       regulator-name = "vcc_flash";                   
+       };
+&apio3_vdd_domain{
+       regulator-name = "vccio_wl";            
+       };
+&apio5_vdd_domain{
+       regulator-name = "vccio";               
+       };
+&apio4_vdd_domain{
+       regulator-name = "vccio";               
+       };
+&apio1_vdd_domain{
+       regulator-name = "vccio";                       
+       };
+&apio2_vdd_domain{
+       regulator-name = "vccio";               
+       };
+&sdmmc0_vdd_domain{
+       regulator-name = "vcc_sd";                      
+       };
+