arm/dts: Add pinctrl driver entries for omap2/3/4

Add pinctrl driver entries for omap2+. These all use
the generic pinctrl-single driver for the padconf
registers.

Cc: devicetree-discuss@lists.ozlabs.org
Acked-by: Linus Walleij <linus.walleij@linaro.org>
[tony@atomide.com: updated to drop omap2420.dtsi rename changes]
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi
index 6174d3d93b1f9d7941435060690e80a2398efc9a..bfd76b4a0ddc95cc1c4d8d381c2420530dfd4a36 100644 (file)
--- a/arch/arm/boot/dts/omap2420.dtsi
+++ b/arch/arm/boot/dts/omap2420.dtsi
@@ -14,6 +14,15 @@
        compatible = "ti,omap2420", "ti,omap2";
 
        ocp {
+               omap2420_pmx: pinmux@48000030 {
+                       compatible = "ti,omap2420-padconf", "pinctrl-single";
+                       reg = <0x48000030 0x0113>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       pinctrl-single,register-width = <8>;
+                       pinctrl-single,function-mask = <0x3f>;
+               };
+
                mcbsp1: mcbsp@48074000 {
                        compatible = "ti,omap2420-mcbsp";
                        reg = <0x48074000 0xff>;

diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index 59a639a337947b57e9f05ff061c3a155acc1738a..4565d9750f4d82198646260c91d2fb497e6eb597 100644 (file)
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -14,6 +14,15 @@
        compatible = "ti,omap2430", "ti,omap2";
 
        ocp {
+               omap2430_pmx: pinmux@49002030 {
+                       compatible = "ti,omap2430-padconf", "pinctrl-single";
+                       reg = <0x49002030 0x0154>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       pinctrl-single,register-width = <8>;
+                       pinctrl-single,function-mask = <0x3f>;
+               };
+
                mcbsp1: mcbsp@48074000 {
                        compatible = "ti,omap2430-mcbsp";
                        reg = <0x48074000 0xff>;

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 05c26c4f6606788aad040ab53cd9cd5934ac11d0..f38ea8771b44fb1b1ffe71830e74bed6d628ef66 100644 (file)
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -68,6 +68,24 @@
                        reg = <0x48200000 0x1000>;
                };
 
+               omap3_pmx_core: pinmux@48002030 {
+                       compatible = "ti,omap3-padconf", "pinctrl-single";
+                       reg = <0x48002030 0x05cc>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       pinctrl-single,register-width = <16>;
+                       pinctrl-single,function-mask = <0x7fff>;
+               };
+
+               omap3_pmx_wkup: pinmux@0x48002a58 {
+                       compatible = "ti,omap3-padconf", "pinctrl-single";
+                       reg = <0x48002a58 0x5c>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       pinctrl-single,register-width = <16>;
+                       pinctrl-single,function-mask = <0x7fff>;
+               };
+
                gpio1: gpio@48310000 {
                        compatible = "ti,omap3-gpio";
                        ti,hwmods = "gpio1";

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 75095e306d7759562ae4761de8d0f65d241f4d5f..5d1c48459e6e302ba63a36531762cc5a6e95aeb8 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -95,6 +95,23 @@
                ranges;
                ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
 
+               omap4_pmx_core: pinmux@4a100040 {
+                       compatible = "ti,omap4-padconf", "pinctrl-single";
+                       reg = <0x4a100040 0x0196>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       pinctrl-single,register-width = <16>;
+                       pinctrl-single,function-mask = <0x7fff>;
+               };
+               omap4_pmx_wkup: pinmux@4a31e040 {
+                       compatible = "ti,omap4-padconf", "pinctrl-single";
+                       reg = <0x4a31e040 0x0038>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       pinctrl-single,register-width = <16>;
+                       pinctrl-single,function-mask = <0x7fff>;
+               };
+
                gpio1: gpio@4a310000 {
                        compatible = "ti,omap4-gpio";
                        reg = <0x4a310000 0x200>;