From 1b6f23685d46151b7b450ecc17ac1a1242493351 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 24 Jun 2014 21:13:44 -0300 Subject: 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 Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx6qdl.dtsi | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/boot/dts/imx6qdl.dtsi') diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 1fd272b52df1..d7c97d95c525 100644 --- 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 { -- cgit v1.2.3