Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / lcd-b101ew05.dtsi

diff --git a/arch/arm/boot/dts/lcd-b101ew05.dtsi b/arch/arm/boot/dts/lcd-b101ew05.dtsi
index e0c2db4f92c99ff1867bb1038b183b67e84bc5c9..fc6385cedab7e705b7a73dcf722a73548d29cc19 100644 (file)
--- a/arch/arm/boot/dts/lcd-b101ew05.dtsi
+++ b/arch/arm/boot/dts/lcd-b101ew05.dtsi
@@ -4,49 +4,64 @@
  */
 
 / {
-               disp_power_ctr: power_ctr {
-                        rockchip,debug = <0>;
-                        lcd_en:lcd_en {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio0 GPIO_B0 1>;
-                                rockchip,delay = <10>;
-                        };
-
-                     /*   bl_en:bl_en {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio0 GPIO_A2 1>;
-                                rockchip,delay = <10>;
-                        };
-
-                        bl_ctr:bl_ctr {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio3 GPIO_D6 1>;
-                                rockchip,delay = <10>;
-                        };
-
-                        lcd_rst:lcd_rst {
-                                rockchip,power_type = <REGULATOR>;
-                                rockchip,delay = <5>;
-                        };*/
-
-                };
 
                disp_timings: display-timings {
                         native-mode = <&timing0>;
                         timing0: timing0 {
+                               screen-type = <SCREEN_LVDS>;
+                               lvds-format = <LVDS_8BIT_2>;
+                               out-face    = <OUT_D888_P666>;
+                               color-mode = <COLOR_RGB>;
                                clock-frequency = <71000000>;
                                hactive = <1280>;
-                                vactive = <800>;
-                                hback-porch = <100>;
-                                hfront-porch = <18>;
-                                vback-porch = <8>;
-                                vfront-porch = <6>;
-                                hsync-len = <10>;
-                                vsync-len = <2>;
-                                hsync-active = <0>;
-                                vsync-active = <0>;
-                                de-active = <1>;
-                                pixelclk-active = <0>;
-                       };
-               };
+                               vactive = <800>;
+                               hback-porch = <100>;
+                               hfront-porch = <18>;
+                               vback-porch = <8>;
+                               vfront-porch = <6>;
+                               hsync-len = <10>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <0>;
+                               pixelclk-active = <0>;
+                               swap-rb = <0>;
+                               swap-rg = <0>;
+                               swap-gb = <0>;
+                               cabc-lut = <
+                                       /*gamma = 2.0*/
+                                        0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+                                        0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+                                        0x00000001 0x00000001 0x00000001 0x00000001 0x00000001 0x00000001 0x00000001 0x00000002
+                                        0x00000002 0x00000002 0x00000002 0x00000002 0x00000003 0x00000003 0x00000003 0x00000003
+                                        0x00000004 0x00000004 0x00000004 0x00000004 0x00000005 0x00000005 0x00000005 0x00000005
+                                        0x00000006 0x00000006 0x00000006 0x00000007 0x00000007 0x00000007 0x00000008 0x00000008
+                                        0x00000009 0x00000009 0x00000009 0x0000000a 0x0000000a 0x0000000b 0x0000000b 0x0000000b
+                                        0x0000000c 0x0000000c 0x0000000d 0x0000000d 0x0000000e 0x0000000e 0x0000000f 0x0000000f
+                                        0x00000010 0x00000010 0x00000011 0x00000011 0x00000012 0x00000012 0x00000013 0x00000013
+                                        0x00000014 0x00000014 0x00000015 0x00000016 0x00000016 0x00000017 0x00000017 0x00000018
+                                        0x00000019 0x00000019 0x0000001a 0x0000001b 0x0000001b 0x0000001c 0x0000001d 0x0000001d
+                                        0x0000001e 0x0000001f 0x0000001f 0x00000020 0x00000021 0x00000021 0x00000022 0x00000023
+                                        0x00000024 0x00000024 0x00000025 0x00000026 0x00000027 0x00000028 0x00000028 0x00000029
+                                        0x0000002a 0x0000002b 0x0000002c 0x0000002c 0x0000002d 0x0000002e 0x0000002f 0x00000030
+                                        0x00000031 0x00000032 0x00000032 0x00000033 0x00000034 0x00000035 0x00000036 0x00000037
+                                        0x00000038 0x00000039 0x0000003a 0x0000003b 0x0000003c 0x0000003d 0x0000003e 0x0000003f
+                                        0x00000040 0x00000041 0x00000042 0x00000043 0x00000044 0x00000045 0x00000046 0x00000047
+                                        0x00000048 0x00000049 0x0000004a 0x0000004b 0x0000004c 0x0000004d 0x0000004f 0x00000050
+                                        0x00000051 0x00000052 0x00000053 0x00000054 0x00000055 0x00000057 0x00000058 0x00000059
+                                        0x0000005a 0x0000005b 0x0000005d 0x0000005e 0x0000005f 0x00000060 0x00000061 0x00000063
+                                        0x00000064 0x00000065 0x00000066 0x00000068 0x00000069 0x0000006a 0x0000006c 0x0000006d
+                                        0x0000006e 0x00000070 0x00000071 0x00000072 0x00000074 0x00000075 0x00000076 0x00000078
+                                        0x00000079 0x0000007a 0x0000007c 0x0000007d 0x0000007f 0x00000080 0x00000081 0x00000083
+                                        0x00000084 0x00000086 0x00000087 0x00000089 0x0000008a 0x0000008c 0x0000008d 0x0000008f
+                                        0x00000090 0x00000092 0x00000093 0x00000095 0x00000096 0x00000098 0x00000099 0x0000009b
+                                        0x0000009c 0x0000009e 0x000000a0 0x000000a1 0x000000a3 0x000000a4 0x000000a6 0x000000a8
+                                        0x000000a9 0x000000ab 0x000000ac 0x000000ae 0x000000b0 0x000000b1 0x000000b3 0x000000b5
+                                        0x000000b6 0x000000b8 0x000000ba 0x000000bc 0x000000bd 0x000000bf 0x000000c1 0x000000c3
+                                        0x000000c4 0x000000c6 0x000000c8 0x000000ca 0x000000cb 0x000000cd 0x000000cf 0x000000d1
+                                        0x000000d3 0x000000d4 0x000000d6 0x000000d8 0x000000da 0x000000dc 0x000000de 0x000000e0
+                                        0x000000e1 0x000000e3 0x000000e5 0x000000e7 0x000000e9 0x000000eb 0x000000ed 0x000000ef
+                                        0x000000f1 0x000000f3 0x000000f5 0x000000f7 0x000000f9 0x000000fb 0x000000fd 0x000000ff>;
+                       };
+               };
 };