ENGR00278128 ARM: dts: Add kpp support for i.MX6SL

Add i.MX6SL keyboard feature.
There are 8 keys on i.MX6SL EVK board, enable them.

Signed-off-by: Anson Huang <b20788@freescale.com>

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 15f9fda3196d74179d07d9ed01e62a8ad14b6a97..236aee39a95b0ff33583f6f5f9289b5fd0625819 100644 (file)
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -324,6 +324,22 @@
        };
 };
 
+&kpp {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_kpp_1>;
+       linux,keymap = <
+                       0x00000067      /* KEY_UP */
+                       0x0001006c      /* KEY_DOWN */
+                       0x0002001c      /* KEY_ENTER */
+                       0x01000066      /* KEY_HOME */
+                       0x0101006a      /* KEY_RIGHT */
+                       0x01020069      /* KEY_LEFT */
+                       0x02000072      /* KEY_VOLUMEDOWN */
+                       0x02010073      /* KEY_VOLUMEUP */
+               >;
+        status = "okay";
+};
+
 &lcdif {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lcdif_dat_0

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 9f2cfbef83f51d8a17728f8749a83015d85dec87..2b84330a9bd8bb2a7e0af4f63c311a8fca42e206 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -373,8 +373,10 @@
                        };
 
                        kpp: kpp@020b8000 {
+                               compatible = "fsl,imx6sl-kpp", "fsl,imx21-kpp";
                                reg = <0x020b8000 0x4000>;
                                interrupts = <0 82 0x04>;
+                               clocks = <&clks IMX6SL_CLK_DUMMY>;
                        };
 
                        wdog1: wdog@020bc000 {
@@ -897,6 +899,19 @@
                };
        };
 
+       kpp {
+               pinctrl_kpp_1: kpp_grp_1 {
+                       fsl,pins = <
+                               MX6SL_PAD_KEY_ROW0__KEY_ROW0      0x1b010
+                               MX6SL_PAD_KEY_ROW1__KEY_ROW1      0x1b010
+                               MX6SL_PAD_KEY_ROW2__KEY_ROW2      0x1b0b0
+                               MX6SL_PAD_KEY_COL0__KEY_COL0      0x80000000
+                               MX6SL_PAD_KEY_COL1__KEY_COL1      0x80000000
+                               MX6SL_PAD_KEY_COL2__KEY_COL2      0x80000000
+                       >;
+               };
+       };
+
        lcdif {
                pinctrl_lcdif_dat_0: lcdifdatgrp-0 {
                        fsl,pins = <