diff options
| author | Nishanth Menon <nm@ti.com> | 2014-05-23 07:58:08 +0200 |
|---|---|---|
| committer | Nishanth Menon <nm@ti.com> | 2014-09-09 15:32:57 +0200 |
| commit | 924c31cc688231292119aa1bdbf7ce349c42ca49 (patch) | |
| tree | f9794d31ae1f42a9aa4317cd131d79ad252d1c20 | |
| parent | Linux 3.17-rc1 (diff) | |
| download | linux-924c31cc688231292119aa1bdbf7ce349c42ca49.tar.xz linux-924c31cc688231292119aa1bdbf7ce349c42ca49.zip | |
ARM: dts: OMAP5: switch to compatible pinctrl
Now that ti,omap5-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>
| -rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index fc8df1739f39..ea08ad874f82 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -187,18 +187,22 @@ }; omap5_pmx_core: pinmux@4a002840 { - compatible = "ti,omap4-padconf", "pinctrl-single"; + compatible = "ti,omap5-padconf", "pinctrl-single"; reg = <0x4a002840 0x01b6>; #address-cells = <1>; #size-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; pinctrl-single,register-width = <16>; pinctrl-single,function-mask = <0x7fff>; }; omap5_pmx_wkup: pinmux@4ae0c840 { - compatible = "ti,omap4-padconf", "pinctrl-single"; + compatible = "ti,omap5-padconf", "pinctrl-single"; reg = <0x4ae0c840 0x0038>; #address-cells = <1>; #size-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; pinctrl-single,register-width = <16>; pinctrl-single,function-mask = <0x7fff>; }; |