arm: dts: rk3288-evb-act8846: add power supply for eDP

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

diff --git a/arch/arm/boot/dts/rk3288-tb_8846.dts b/arch/arm/boot/dts/rk3288-tb_8846.dts
old mode 100644 (file)
new mode 100755 (executable)
index e8e718e..230a75d
--- a/arch/arm/boot/dts/rk3288-tb_8846.dts
+++ b/arch/arm/boot/dts/rk3288-tb_8846.dts
@@ -13,13 +13,12 @@
     wireless-wlan {
         compatible = "wlan-platdata";
 
-        /* wifi_chip_type - wifi chip define
-         * bcmwifi ==> like ap6xxx, rk90x;
-         * rtkwifi ==> like rtl8188xx, rtl8723xx;
-         * esp8089 ==> esp8089;
-         * other   ==> for other wifi;
-         */
-        wifi_chip_type = "bcmwifi";
+               /* wifi_chip_type - wifi chip define
+                 * ap6210, ap6330, ap6335
+                 * rtl8188eu, rtl8723bs, rtl8723bu
+                 * esp8089
+               */
+               wifi_chip_type = "ap6335";
 
         sdio_vref = <1800>; //1800mv or 3300mv
 
@@ -121,7 +120,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -137,7 +136,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -147,7 +146,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -163,7 +162,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -173,7 +172,7 @@
                        };
                        dai1 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "dsp_a";
                                //continuous-clock;
                                bitclock-inversion;
@@ -277,9 +276,9 @@
 
         supports-highspeed;
        supports-emmc;
-        bootpart-no-access;
+        //supports-sd;
+       bootpart-no-access;
 
-       //supports-tSD;
        //supports-DDR_MODE; //you should set the two value in your project. only close in RK3288-SDK board.
        //caps2-mmc-hs200;
 
@@ -501,11 +500,29 @@
                irq_gpio = <&gpio0 GPIO_A4 IRQ_TYPE_EDGE_FALLING>;
        };
 
+       /*
+       mpu6880_acc:mpu_acc@68{
+               compatible = "mpu6880_acc";
+               reg = <0x68>;
+               irq_enable = <0>;
+               poll_delay_ms = <30>;
+               type = <SENSOR_TYPE_ACCEL>;
+               layout = <7>;
+       };
+       mpu6880_gyro:mpu_gyro@68{
+               compatible = "mpu6880_gyro";
+               reg = <0x68>;
+               //irq-gpio = <&gpio7 GPIO_B0 IRQ_TYPE_LEVEL_LOW>;
+               irq_enable = <0>;
+               poll_delay_ms = <30>;
+               type = <SENSOR_TYPE_GYROSCOPE>;
+               layout = <7>;
+       };
+       */
 };
 
 &i2c1 {
        status = "okay";
-               
        mpu6050:mpu@68{
                compatible = "mpu6050";
                reg = <0x68>;
@@ -518,7 +535,6 @@
                irq-gpio = <&gpio8 GPIO_A0 IRQ_TYPE_LEVEL_LOW>;                 
                mpu-debug = <0>;
        };
-       
 
        ak8963:compass@0d{
                compatible = "mpu_ak8963";
@@ -641,7 +657,7 @@
 
 &hdmi {
        status = "okay";
-       rockchips,hdmi_audio_source = <0>;
+       rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
 };
 
 &adc {
@@ -786,6 +802,13 @@
                SYS_STATUS_BOOST        324000
                SYS_STATUS_ISP          400000
                >;
+       bd-freq-table = <
+               /* bandwidth   freq */
+               5000           800000
+               3500           456000
+               2600           396000
+               2000           324000
+       >;
        auto-freq-table = <
                240000
                324000
@@ -1055,10 +1078,6 @@
        regulator-name = "vcc_sd";                      
        };
 
-&ion_cma {
-       reg = <0x40000000 0x28000000>; /* 640MB */
-};
-
 &dwc_control_usb {
        usb_uart {
                status = "disabled";