ARM: rockchip: rk3228: implement function rk3228_restart

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

diff --git a/arch/arm/boot/dts/rk3288-p977_8846.dts b/arch/arm/boot/dts/rk3288-p977_8846.dts
index 0e2c9ec92e4ad5b8c5f14dc67946d61d382eeacf..d40aac95e1613ff81e290c0e1bd992f594759507 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-p977_8846.dts
+++ b/arch/arm/boot/dts/rk3288-p977_8846.dts
@@ -2,7 +2,7 @@
 
 #include "rk3288.dtsi"
 #include "lcd-LP097Qx1.dtsi"
-
+#include "vtl_ts_p977.dtsi"
 / {
        fiq-debugger {
                status = "okay";
@@ -18,7 +18,7 @@
     wireless-wlan {
         compatible = "wlan-platdata";
 
-        wifi_chip_type = "";
+        wifi_chip_type = "ap6210";
         sdio_vref = <1800>; //1800mv or 3300mv
 
         //power_ctrl_by_pmu;
@@ -110,7 +110,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -126,7 +126,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };              
        };
@@ -136,7 +136,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -155,10 +155,6 @@
                rockchip,remote_wakeup;
                rockchip,usb_irq_wakeup;
        };
-
-        chosen {
-                bootargs = "vmalloc=512M";
-        };
 };
 &pinctrl {
        gpio0_gpio {
@@ -210,7 +206,7 @@
        ignore-pm-notify;
         keep-power-in-suspend;
        
-        vmmc-supply = <&rk808_ldo5_reg>;
+        vmmc-supply = <&ldo1_reg>;
        status = "okay";
 };
                
@@ -492,6 +488,12 @@
                reg = <0x01>;
                screen_max_x = <2048>;
                screen_max_y = <1536>;
+        xy_swap = <0>;
+        x_reverse = <0>;
+        y_reverse = <1>;
+        x_mul = <1>;
+        y_mul = <1>;
+        bin_ver = <1>;
                irq_gpio_number = <&gpio7 GPIO_A6 IRQ_TYPE_LEVEL_LOW>;
                rst_gpio_number = <&gpio7 GPIO_A5 GPIO_ACTIVE_HIGH>;
        };
@@ -503,6 +505,7 @@
 
 &fb {
        rockchip,disp-mode = <DUAL>;
+       rockchip,uboot-logo-on = <1>;
 };
 
 &rk_screen {
@@ -546,7 +549,7 @@
 
 &hdmi {
        status = "okay";
-       rockchips,hdmi_audio_source = <0>;
+       rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
 };
 
 &adc {
@@ -607,7 +610,7 @@
 };
 
 &pwm1 {
-       status = "disabled";
+       status = "okay";
 };
 
 
@@ -665,6 +668,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
@@ -725,7 +735,7 @@
 
                ldo1_reg: regulator@4 {
                        regulator-name= "vccio_sd";
-                       regulator-min-microvolt = <3300000>;
+                       regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <3300000>;
                        
                };
@@ -932,6 +942,3 @@
 &sdmmc0_vdd_domain{
        regulator-name = "vcc_sd";                      
        };
-&ion_cma {
-       reg = <0x40000000 0x20000000>; /* 512MB */
-};