display patch updated

diff --git a/board/merica/imx6q-rsb4411-a1/patches/kernel/0001_GPIO_keys_and_WUXGA_diplay.patch b/board/merica/imx6q-rsb4411-a1/patches/kernel/0001_GPIO_keys_and_WUXGA_diplay.patch
index 13f9fb91a3f6220a7736f1dc34327a22591ab5bd..465ba37b414b2e250c4b4ba53fe4849dd4344160 100644 (file)
--- a/board/merica/imx6q-rsb4411-a1/patches/kernel/0001_GPIO_keys_and_WUXGA_diplay.patch
+++ b/board/merica/imx6q-rsb4411-a1/patches/kernel/0001_GPIO_keys_and_WUXGA_diplay.patch
@@ -1,5 +1,5 @@
 diff --git a/arch/arm/boot/dts/imx6q-rsb4411-a1.dts b/arch/arm/boot/dts/imx6q-rsb4411-a1.dts
-index 777c654f4..31e63f5dc 100755
+index 777c654f44ac..e573d38031ac 100755
 --- a/arch/arm/boot/dts/imx6q-rsb4411-a1.dts
 +++ b/arch/arm/boot/dts/imx6q-rsb4411-a1.dts
 @@ -24,7 +24,7 @@
@@ -153,85 +153,123 @@ index 777c654f4..31e63f5dc 100755
        ov5640_mipi: ov5640_mipi@3c {
                compatible = "ovti,ov564x_mipi";
                reg = <0x3c>;
-@@ -333,6 +459,81 @@
+@@ -339,10 +465,6 @@
+       status = "okay";
+ };
+ 
+-&mxcfb2 {
+-      status = "okay";
+-};
+-
+ &mxcfb3 {
+       status = "okay";
+ };
+diff --git a/arch/arm/boot/dts/imx6qdl-advantech.dtsi b/arch/arm/boot/dts/imx6qdl-advantech.dtsi
+index 98ffa6b4836b..453999d61ece 100755
+--- a/arch/arm/boot/dts/imx6qdl-advantech.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-advantech.dtsi
+@@ -93,7 +93,7 @@
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "ldb";
+               interface_pix_fmt = "RGB24";
+-              default_bpp = <16>;
++              default_bpp = <32>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "disabled";
+@@ -961,7 +961,7 @@
  
  &ldb {
        status = "okay";
+-      /* split-mode; */ /* dual-channel setting */
 +      split-mode; /* dual-channel setting */
-+
-+      lvds-channel@0 {
-+              fsl,data-mapping = "spwg";
-+              fsl,data-width = <24>;
-+              crtc = "ipu2-di0";
-+              primary;
-+              status = "okay";
-+
-+              display-timings {
+ 
+       lvds-channel@0 {
+               fsl,data-mapping = "spwg";
+@@ -971,67 +971,20 @@
+               status = "okay";
+ 
+               display-timings {
+-                      native-mode = <&timing00>;
+-                      timing00: g070vw01v0 {
+-                              clock-frequency = <29500000>;
+-                              hactive = <800>;
+-                              vactive = <480>;
+-                              hback-porch = <96>;
+-                              hfront-porch = <24>;
+-                              vback-porch = <3>;
+-                              vfront-porch = <10>;
+-                              hsync-len = <72>;
+-                              vsync-len = <7>;
+-                      }; 
 +                      native-mode = <&timingauo>;
-+
+ 
+-                      //SI Test panel
+-                      timing10: g150xgel04 {
+-                              clock-frequency = <63500000>;
+-                              hactive = <1024>;
+-                              vactive = <768>;
+-                              hback-porch = <152>;
+-                              hfront-porch = <48>;
+-                              vback-porch = <3>;
+-                              vfront-porch = <23>;
+-                              hsync-len = <104>;
+-                              vsync-len = <4>;
+-                      };
+-                      //Dual channel panel
+-                      timing20: g190eg01v1 {
+-                              clock-frequency = <109000000>;
+-                              hactive = <1280>;
+-                              vactive = <1024>;
+-                              hback-porch = <216>;
+-                              hfront-porch = <80>;
+-                              vback-porch = <3>;
+-                              vfront-porch = <29>;
+-                              hsync-len = <136>;
+-                              vsync-len = <7>;
+-                      };
+-                      //Dual channel panel 
+-                      timing30: g215hvn0 {
+-                              clock-frequency = <170000000>;
 +            timingauo: b101uan021 {
-+                              clock-frequency = <170000000>;
-+                              hactive = <1920>;
++                              clock-frequency = <157600000>;
+                               hactive = <1920>;
+-                              vactive = <1080>;
+-                              hback-porch = <90>;
+-                              hfront-porch = <30>;
+-                              vback-porch = <5>;
+-                              vfront-porch = <38>;
+-                              hsync-len = <60>;
+-                              vsync-len = <7>;
+-                      };
+-
+-                      timing40:g150xgel05 {
+-                              clock-frequency = <65000000>;
+-                              hactive = <1024>;
+-                              vactive = <768>;
+-                              hback-porch = <220>;
+-                              hfront-porch = <40>;
+-                              vback-porch = <21>;
+-                              vfront-porch = <7>;
 +                              vactive = <1200>;
-+                              hback-porch = <0>;
-+                              hfront-porch = <0>;
-+                              vback-porch = <0>;
-+                              vfront-porch = <0>;
-+                              hsync-len = <138>;
-+                              vsync-len = <12>;
-+            };
-+
-+              };
-+      };
-+
-+      lvds-channel@1 {
-+              fsl,data-mapping = "spwg";
-+              fsl,data-width = <24>;
-+              crtc = "ipu1-di1";
-+              /* crtc = "ipu1-di0"; */ /* dual-channel setting */
-+              status = "okay";
-+/*
-+              display-timings {
-+                      native-mode = <&timing01>;
-+                      timing01: g070vw01v0 {
-+                              clock-frequency = <29500000>;
-+                              hactive = <800>;
-+                              vactive = <480>;
-+                              hback-porch = <96>;
-+                              hfront-porch = <24>;
-+                              vback-porch = <3>;
++                              hback-porch = <60>;
++                              hfront-porch = <60>;
++                              vback-porch = <30>;
 +                              vfront-porch = <10>;
-+                              hsync-len = <72>;
-+                              vsync-len = <7>;
-+                      };
-+
-+                      //SI Test panel
-+                      timing11: g150xgel04 {
-+                              clock-frequency = <63500000>;
-+                              hactive = <1024>;
-+                              vactive = <768>;
-+                              hback-porch = <152>;
-+                              hfront-porch = <48>;
-+                              vback-porch = <3>;
-+                              vfront-porch = <23>;
-+                              hsync-len = <104>;
-+                              vsync-len = <4>;
-+                      };
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+-                      };
++            };
 +
-+                      timing21:g150xgel05 {
-+                              clock-frequency = <65000000>;
-+                              hactive = <1024>;
-+                              vactive = <768>;
-+                              hback-porch = <220>;
-+                              hfront-porch = <40>;
-+                              vback-porch = <21>;
-+                              vfront-porch = <7>;
-+                              hsync-len = <60>;
-+                              vsync-len = <10>;
-+                      };
-+              };
-+*/
-+      };
- };
+               };
+       };
  
- &mxcfb1 {
+@@ -1068,7 +1021,7 @@
+                               hsync-len = <104>;
+                               vsync-len = <4>;
+                       };
+-                      
++
+                       timing21:g150xgel05 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;