summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6qdl-tx6.dtsi
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-06-25 04:13:44 +0400
committerShawn Guo <shawn.guo@freescale.com>2014-07-18 12:49:40 +0400
commit1b6f23685d46151b7b450ecc17ac1a1242493351 (patch)
treea288f4c81d9b72e5c431ac8050ef16fb6c77e1c4 /arch/arm/boot/dts/imx6qdl-tx6.dtsi
parent548220832123658e65f6b711f845d613e3cc02f0 (diff)
downloadlinux-1b6f23685d46151b7b450ecc17ac1a1242493351.tar.xz
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>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-tx6.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6qdl-tx6.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index 66a135392342..f02b80b41d4f 100644
--- 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 {