Merge tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette...

[~andy/linux] / arch / arm / boot / dts / omap34xx.dtsi

diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi
index d531abfc6e9425ee23efc083672f9e8421b8f729..2e92360da1f36d29d094ef67c8183a8824c0f047 100644 (file)
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@ -25,8 +25,21 @@
                        clock-latency = <300000>; /* From legacy driver */
                };
        };
+
+       ocp {
+               omap3_pmx_core2: pinmux@480025d8 {
+                       compatible = "ti,omap3-padconf", "pinctrl-single";
+                       reg = <0x480025d8 0x24>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       #interrupt-cells = <1>;
+                       interrupt-controller;
+                       pinctrl-single,register-width = <16>;
+                       pinctrl-single,function-mask = <0xff1f>;
+               };
+       };
 };
 
 /include/ "omap34xx-omap36xx-clocks.dtsi"
 /include/ "omap36xx-omap3430es2plus-clocks.dtsi"
-/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
\ No newline at end of file
+/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"