diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-06-24 21:13:44 -0300 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@freescale.com> | 2014-07-18 16:49:40 +0800 |
| commit | 1b6f23685d46151b7b450ecc17ac1a1242493351 (patch) | |
| tree | a288f4c81d9b72e5c431ac8050ef16fb6c77e1c4 /arch | |
| parent | 548220832123658e65f6b711f845d613e3cc02f0 (diff) | |
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')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-tx6.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sl.dtsi | 1 |
3 files changed, 3 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 { 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 { diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 57d4abe03a94..c0ee12f1f171 100644 --- 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 { |