summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2014-05-22 23:47:46 -0500
committerNishanth Menon <nm@ti.com>2014-09-09 08:32:59 -0500
commit817c0378c50c2aab2b026caab7486df6895ed8a2 (patch)
tree44ccaa600fad1375e4a8230a0c76d32e47d20416 /arch/arm
parent924c31cc688231292119aa1bdbf7ce349c42ca49 (diff)
ARM: dts: DRA7: switch to compatible pinctrl
Now that ti,dra7-padconf is available, switch over to that compatible property. Retain pinctrl-single for legacy support. While at it, mark pinctrl as interrupt controller so that it can be used with interrupts-extended property for wakeup events. Signed-off-by: Nishanth Menon <nm@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/dra7.dtsi4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 97f603c4483d..f8654a8b6aa2 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -217,10 +217,12 @@
};
dra7_pmx_core: pinmux@4a003400 {
- compatible = "pinctrl-single";
+ compatible = "ti,dra7-padconf", "pinctrl-single";
reg = <0x4a003400 0x0464>;
#address-cells = <1>;
#size-cells = <0>;
+ #interrupt-cells = <1>;
+ interrupt-controller;
pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <0x3fffffff>;
};