ARM: dts: mx6: Disable the keypad in the dtsi files

When booting a board that does not have a keypad (such as imx6q-sabresd) the
following error is seen on boot:

imx-keypad 20b8000.kpp: OF: linux,keymap property not defined in /soc/aips-bus@02000000/kpp@020b8000
imx-keypad 20b8000.kpp: failed to build keymap
imx-keypad: probe of 20b8000.kpp failed with error -2

Let's disable the keypad functionality in the dtsi files and let each board dts
enable it when needed.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index 66a135392342071a1b096d829ac5f700432304c4..f02b80b41d4fb94d9a5f690d9ddc6d89371e32f6 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -620,6 +620,7 @@
                MATRIX_KEY(2, 7, KEY_KP8) /* 0x02070048 */
                MATRIX_KEY(2, 2, KEY_KP9) /* 0x02020049 */
        >;
+       status = "okay";
 };
 
 &pwm1 {

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 1fd272b52df15e9abe02a2ba249e81a1ff358505..d7c97d95c525bd3d519a09ac3fad6d73bd46d96e 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -485,6 +485,7 @@
                                reg = <0x020b8000 0x4000>;
                                interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6QDL_CLK_IPG>;
+                               status = "disabled";
                        };
 
                        wdog1: wdog@020bc000 {

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 2d4e5285f3f36556a15c4d0b0ff6561ae3db4d2a..0aff5072e7c7a6c69fd6eed2a0a94ebd7d34e29c 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -403,6 +403,7 @@
                                reg = <0x020b8000 0x4000>;
                                interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SL_CLK_DUMMY>;
+                               status = "disabled";
                        };
 
                        wdog1: wdog@020bc000 {