mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Fabio Estevam 2014-06-24 21:13:44 -03:00 committed by Shawn Guo
parent 5482208321
commit 1b6f23685d
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/imx6qdl-tx6.dtsi
View File

@ -620,6 +620,7 @@
MATRIX_KEY(2, 7, KEY_KP8) /* 0x02070048 */
MATRIX_KEY(2, 2, KEY_KP9) /* 0x02020049 */
>;
status = "okay";
};
&pwm1 {

1
arch/arm/boot/dts/imx6qdl.dtsi
View File

@ -485,6 +485,7 @@
reg = <0x020b8000 0x4000>;
interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6QDL_CLK_IPG>;
status = "disabled";
};
wdog1: wdog@020bc000 {

1
arch/arm/boot/dts/imx6sl.dtsi
View File

@ -403,6 +403,7 @@
reg = <0x020b8000 0x4000>;
interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_DUMMY>;
status = "disabled";
};
wdog1: wdog@020bc000 {