summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Ford <aford173@gmail.com>2019-08-16 17:58:12 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-10 11:27:17 +0100
commit9a5d5ffb32459f43a5c1a02f7a628bd75e8a7ae6 (patch)
treee434b668b2a996de519e226340df2f29187a6949
parentd7e2a8e271aaeef572dc75b268c48fd4e6285ac1 (diff)
downloadlinux-stable-9a5d5ffb32459f43a5c1a02f7a628bd75e8a7ae6.tar.gz
linux-stable-9a5d5ffb32459f43a5c1a02f7a628bd75e8a7ae6.tar.bz2
linux-stable-9a5d5ffb32459f43a5c1a02f7a628bd75e8a7ae6.zip
ARM: dts: logicpd-torpedo-som: Remove twl_keypad
[ Upstream commit 6b512b0ee091edcb8e46218894e4c917d919d3dc ] The TWL4030 used on the Logit PD Torpedo SOM does not have the keypad pins routed. This patch disables the twl_keypad driver to remove some splat during boot: twl4030_keypad 48070000.i2c:twl@48:keypad: missing or malformed property linux,keymap: -22 twl4030_keypad 48070000.i2c:twl@48:keypad: Failed to build keymap twl4030_keypad: probe of 48070000.i2c:twl@48:keypad failed with error -22 Signed-off-by: Adam Ford <aford173@gmail.com> [tony@atomide.com: removed error time stamps] Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/arm/boot/dts/logicpd-torpedo-som.dtsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 7d2302e8706c..9354da4efe09 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -196,3 +196,7 @@
&twl_gpio {
ti,use-leds;
};
+
+&twl_keypad {
+ status = "disabled";
+};