diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-09-09 19:28:41 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-09-09 19:28:41 -0700 |
| commit | 6e5542604ab64d9a7866226bbab3725532caf070 (patch) | |
| tree | 223271abe58c4bff4e096aa5fe9ca1271ecb679b /arch/arm/boot/dts/am4372.dtsi | |
| parent | 83c9b2afe66abf5dc6dab68da738557001fb5660 (diff) | |
| parent | 66b0436977e2c62388d48836ff784f1fedb49c4f (diff) | |
Merge branch 'pull/v3.18/for-dt-pinctrl-updates' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/dt
Diffstat (limited to 'arch/arm/boot/dts/am4372.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am4372.dtsi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 9b3d2ba82f13..b3848306f329 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -58,10 +58,12 @@ }; am43xx_pinmux: pinmux@44e10800 { - compatible = "pinctrl-single"; + compatible = "ti,am437-padconf", "pinctrl-single"; reg = <0x44e10800 0x31c>; #address-cells = <1>; #size-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0xffffffff>; }; |