summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorLothar Waßmann <LW@KARO-electronics.de>2016-01-20 11:09:08 +0100
committerShawn Guo <shawnguo@kernel.org>2016-02-29 16:17:43 +0800
commitea1c17525df71a5bb08e4392e0bb21ea062610d6 (patch)
treef8bb0b9fff9402c4698a773bafde9d77e041442f /arch/arm/boot
parent7d1cd2978664ddb8fb5ee79d347108c213638f3a (diff)
downloadblackbird-op-linux-ea1c17525df71a5bb08e4392e0bb21ea062610d6.tar.gz
blackbird-op-linux-ea1c17525df71a5bb08e4392e0bb21ea062610d6.zip
ARM: dts: imx6ul: add kpp support
This patch adds the device node for the i.MX6UL keypad controller. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6ul.dtsi8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 8499b3db18a5..71778992f03d 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -471,6 +471,14 @@
status = "disabled";
};
+ kpp: kpp@020b8000 {
+ compatible = "fsl,imx6ul-kpp", "fsl,imx6q-kpp", "fsl,imx21-kpp";
+ reg = <0x020b8000 0x4000>;
+ interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks IMX6UL_CLK_KPP>;
+ status = "disabled";
+ };
+
wdog1: wdog@020bc000 {
compatible = "fsl,imx6ul-wdt", "fsl,imx21-wdt";
reg = <0x020bc000 0x4000>;
OpenPOWER on IntegriCloud