board/merica/imx6q-rsb4411-a1/patches/kernel/0001_GPIO_keys_and_WUXGA_diplay.patch

   1 diff --git a/arch/arm/boot/dts/imx6q-rsb4411-a1.dts b/arch/arm/boot/dts/imx6q-rsb4411-a1.dts
   2 index 777c654f44ac..e573d38031ac 100755
   3 --- a/arch/arm/boot/dts/imx6q-rsb4411-a1.dts
   4 +++ b/arch/arm/boot/dts/imx6q-rsb4411-a1.dts
   5 @@ -24,7 +24,7 @@
   6                 board-type = "RSB-4411 A1";
   7                 board-cpu = "DualQuad";
   8         };
   9 -
  10 +
  11         regulators {
  12                  reg_usb_otg_vbus: usb_otg_vbus {
  13                          compatible = "regulator-fixed";
  14 @@ -41,6 +41,132 @@
  15                         mmc0 = &usdhc4;
  16                 };
  17
  18 +    gpio-keys {
  19 +        compatible = "gpio-keys";
  20 +        #address-cells = <1>;
  21 +        #size-cells = <0>;
  22 +        label = "gpio-keys";
  23 +        gpio01 {
  24 +            label = "gpio01";
  25 +            gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
  26 +            linux,code = <BTN_TRIGGER_HAPPY1>;
  27 +            gpio-key,wakeup;
  28 +        };
  29 +        gpio02 {
  30 +            label = "gpio02";
  31 +            gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
  32 +            linux,code = <BTN_TRIGGER_HAPPY2>;
  33 +            gpio-key,wakeup;
  34 +        };
  35 +        gpio03 {
  36 +            label = "gpio03";
  37 +            gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
  38 +            linux,code = <BTN_TRIGGER_HAPPY3>;
  39 +            gpio-key,wakeup;
  40 +        };
  41 +        gpio04 {
  42 +            label = "gpio04";
  43 +            gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
  44 +            linux,code = <BTN_TRIGGER_HAPPY4>;
  45 +            gpio-key,wakeup;
  46 +        };
  47 +        gpio05 {
  48 +            label = "gpio05";
  49 +            gpios = <&gpio6 31 GPIO_ACTIVE_LOW>;
  50 +            linux,code = <BTN_TRIGGER_HAPPY5>;
  51 +            gpio-key,wakeup;
  52 +        };
  53 +        gpio06 {
  54 +            label = "gpio06";
  55 +            gpios = <&gpio3 30 GPIO_ACTIVE_LOW>;
  56 +            linux,code = <BTN_TRIGGER_HAPPY6>;
  57 +            gpio-key,wakeup;
  58 +        };
  59 +        gpio07 {
  60 +            label = "gpio07";
  61 +            gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
  62 +            linux,code = <BTN_TRIGGER_HAPPY7>;
  63 +            gpio-key,wakeup;
  64 +        };
  65 +        gpio08 {
  66 +            label = "gpio08";
  67 +            gpios = <&gpio3 21 GPIO_ACTIVE_LOW>;
  68 +            linux,code = <BTN_TRIGGER_HAPPY8>;
  69 +            gpio-key,wakeup;
  70 +        };
  71 +        gpio09 {
  72 +            label = "gpio09";
  73 +            gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
  74 +            linux,code = <BTN_TRIGGER_HAPPY9>;
  75 +            gpio-key,wakeup;
  76 +        };
  77 +        gpio10 {
  78 +            label = "gpio10";
  79 +            gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
  80 +            linux,code = <BTN_TRIGGER_HAPPY10>;
  81 +            gpio-key,wakeup;
  82 +        };
  83 +        gpio11 {
  84 +            label = "gpio11";
  85 +            gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
  86 +            linux,code = <BTN_TRIGGER_HAPPY11>;
  87 +            gpio-key,wakeup;
  88 +        };
  89 +        gpio12 {
  90 +            label = "gpio12";
  91 +            gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
  92 +            linux,code = <BTN_TRIGGER_HAPPY12>;
  93 +            gpio-key,wakeup;
  94 +        };
  95 +        gpio13 {
  96 +            label = "gpio13";
  97 +            gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
  98 +            linux,code = <BTN_TRIGGER_HAPPY13>;
  99 +            gpio-key,wakeup;
 100 +        };
 101 +        gpio14 {
 102 +            label = "gpio14";
 103 +            gpios = <&gpio6 9 GPIO_ACTIVE_LOW>;
 104 +            linux,code = <BTN_TRIGGER_HAPPY14>;
 105 +            gpio-key,wakeup;
 106 +        };
 107 +        gpio15 {
 108 +            label = "gpio15";
 109 +            gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 110 +            linux,code = <BTN_TRIGGER_HAPPY15>;
 111 +            gpio-key,wakeup;
 112 +        };
 113 +        gpio16 {
 114 +            label = "gpio16";
 115 +            gpios = <&gpio6 16 GPIO_ACTIVE_LOW>;
 116 +            linux,code = <BTN_TRIGGER_HAPPY16>;
 117 +            gpio-key,wakeup;
 118 +        };
 119 +        gpio17 {
 120 +            label = "gpio17";
 121 +            gpios = <&gpio6 7 GPIO_ACTIVE_LOW>;
 122 +            linux,code = <BTN_TRIGGER_HAPPY17>;
 123 +            gpio-key,wakeup;
 124 +        };
 125 +        gpio18 {
 126 +            label = "gpio18";
 127 +            gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 128 +            linux,code = <BTN_TRIGGER_HAPPY18>;
 129 +            gpio-key,wakeup;
 130 +        };
 131 +        gpio19 {
 132 +            label = "gpio19";
 133 +            gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 134 +            linux,code = <BTN_TRIGGER_HAPPY19>;
 135 +            gpio-key,wakeup;
 136 +        };
 137 +        gpio20 {
 138 +            label = "gpio20";
 139 +            gpios = <&gpio6 8 GPIO_ACTIVE_LOW>;
 140 +            linux,code = <BTN_TRIGGER_HAPPY20>;
 141 +            gpio-key,wakeup;
 142 +        };
 143 +    };
 144
 145  };
 146
 147 @@ -113,7 +239,7 @@
 148                 wdt-ping = <&gpio1 9 0>;
 149                 reg = <0x29>;
 150         };
 151 -
 152 +
 153         ov5640_mipi: ov5640_mipi@3c {
 154                 compatible = "ovti,ov564x_mipi";
 155                 reg = <0x3c>;
 156 @@ -339,10 +465,6 @@
 157         status = "okay";
 158  };
 159
 160 -&mxcfb2 {
 161 -       status = "okay";
 162 -};
 163 -
 164  &mxcfb3 {
 165         status = "okay";
 166  };
 167 diff --git a/arch/arm/boot/dts/imx6qdl-advantech.dtsi b/arch/arm/boot/dts/imx6qdl-advantech.dtsi
 168 index 98ffa6b4836b..453999d61ece 100755
 169 --- a/arch/arm/boot/dts/imx6qdl-advantech.dtsi
 170 +++ b/arch/arm/boot/dts/imx6qdl-advantech.dtsi
 171 @@ -93,7 +93,7 @@
 172                 compatible = "fsl,mxc_sdc_fb";
 173                 disp_dev = "ldb";
 174                 interface_pix_fmt = "RGB24";
 175 -               default_bpp = <16>;
 176 +               default_bpp = <32>;
 177                 int_clk = <0>;
 178                 late_init = <0>;
 179                 status = "disabled";
 180 @@ -961,7 +961,7 @@
 181
 182  &ldb {
 183         status = "okay";
 184 -       /* split-mode; */ /* dual-channel setting */
 185 +       split-mode; /* dual-channel setting */
 186
 187         lvds-channel@0 {
 188                 fsl,data-mapping = "spwg";
 189 @@ -971,67 +971,20 @@
 190                 status = "okay";
 191
 192                 display-timings {
 193 -                       native-mode = <&timing00>;
 194 -                       timing00: g070vw01v0 {
 195 -                               clock-frequency = <29500000>;
 196 -                               hactive = <800>;
 197 -                               vactive = <480>;
 198 -                               hback-porch = <96>;
 199 -                               hfront-porch = <24>;
 200 -                               vback-porch = <3>;
 201 -                               vfront-porch = <10>;
 202 -                               hsync-len = <72>;
 203 -                               vsync-len = <7>;
 204 -                       };
 205 +                       native-mode = <&timingauo>;
 206
 207 -                       //SI Test panel
 208 -                       timing10: g150xgel04 {
 209 -                               clock-frequency = <63500000>;
 210 -                               hactive = <1024>;
 211 -                               vactive = <768>;
 212 -                               hback-porch = <152>;
 213 -                               hfront-porch = <48>;
 214 -                               vback-porch = <3>;
 215 -                               vfront-porch = <23>;
 216 -                               hsync-len = <104>;
 217 -                               vsync-len = <4>;
 218 -                       };
 219 -                       //Dual channel panel
 220 -                       timing20: g190eg01v1 {
 221 -                               clock-frequency = <109000000>;
 222 -                               hactive = <1280>;
 223 -                               vactive = <1024>;
 224 -                               hback-porch = <216>;
 225 -                               hfront-porch = <80>;
 226 -                               vback-porch = <3>;
 227 -                               vfront-porch = <29>;
 228 -                               hsync-len = <136>;
 229 -                               vsync-len = <7>;
 230 -                       };
 231 -                       //Dual channel panel
 232 -                       timing30: g215hvn0 {
 233 -                               clock-frequency = <170000000>;
 234 +            timingauo: b101uan021 {
 235 +                               clock-frequency = <157600000>;
 236                                 hactive = <1920>;
 237 -                               vactive = <1080>;
 238 -                               hback-porch = <90>;
 239 -                               hfront-porch = <30>;
 240 -                               vback-porch = <5>;
 241 -                               vfront-porch = <38>;
 242 -                               hsync-len = <60>;
 243 -                               vsync-len = <7>;
 244 -                       };
 245 -
 246 -                       timing40:g150xgel05 {
 247 -                               clock-frequency = <65000000>;
 248 -                               hactive = <1024>;
 249 -                               vactive = <768>;
 250 -                               hback-porch = <220>;
 251 -                               hfront-porch = <40>;
 252 -                               vback-porch = <21>;
 253 -                               vfront-porch = <7>;
 254 +                               vactive = <1200>;
 255 +                               hback-porch = <60>;
 256 +                               hfront-porch = <60>;
 257 +                               vback-porch = <30>;
 258 +                               vfront-porch = <10>;
 259                                 hsync-len = <60>;
 260                                 vsync-len = <10>;
 261 -                       };
 262 +            };
 263 +
 264                 };
 265         };
 266
 267 @@ -1068,7 +1021,7 @@
 268                                 hsync-len = <104>;
 269                                 vsync-len = <4>;
 270                         };
 271 -
 272 +
 273                         timing21:g150xgel05 {
 274                                 clock-frequency = <65000000>;
 275                                 hactive = <1024>;