aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-09-10 13:34:51 -0400
committerTony Lindgren <tony@atomide.com>2012-09-10 13:45:28 -0400
commit679e33104dbf9b78d88b812fc3c1ac88536d24bf (patch)
treeeaac59f87151f569669050889a28a56bbe9d0a92 /arch/arm
parent642f12b4c7505943a6f50101d5b087a74fd9ae72 (diff)
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/omap2420.dtsi9
-rw-r--r--arch/arm/boot/dts/omap2430.dtsi9
-rw-r--r--arch/arm/boot/dts/omap3.dtsi18
-rw-r--r--arch/arm/boot/dts/omap4.dtsi17
4 files changed, 53 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi
index 6174d3d93b1f..bfd76b4a0ddc 100644
--- a/arch/arm/boot/dts/omap2420.dtsi
+++ b/arch/arm/boot/dts/omap2420.dtsi
@@ -14,6 +14,15 @@
14 compatible = "ti,omap2420", "ti,omap2"; 14 compatible = "ti,omap2420", "ti,omap2";
15 15
16 ocp { 16 ocp {
17 omap2420_pmx: pinmux@48000030 {
18 compatible = "ti,omap2420-padconf", "pinctrl-single";
19 reg = <0x48000030 0x0113>;
20 #address-cells = <1>;
21 #size-cells = <0>;
22 pinctrl-single,register-width = <8>;
23 pinctrl-single,function-mask = <0x3f>;
24 };
25
17 mcbsp1: mcbsp@48074000 { 26 mcbsp1: mcbsp@48074000 {
18 compatible = "ti,omap2420-mcbsp"; 27 compatible = "ti,omap2420-mcbsp";
19 reg = <0x48074000 0xff>; 28 reg = <0x48074000 0xff>;
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index 59a639a33794..4565d9750f4d 100644
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -14,6 +14,15 @@
14 compatible = "ti,omap2430", "ti,omap2"; 14 compatible = "ti,omap2430", "ti,omap2";
15 15
16 ocp { 16 ocp {
17 omap2430_pmx: pinmux@49002030 {
18 compatible = "ti,omap2430-padconf", "pinctrl-single";
19 reg = <0x49002030 0x0154>;
20 #address-cells = <1>;
21 #size-cells = <0>;
22 pinctrl-single,register-width = <8>;
23 pinctrl-single,function-mask = <0x3f>;
24 };
25
17 mcbsp1: mcbsp@48074000 { 26 mcbsp1: mcbsp@48074000 {
18 compatible = "ti,omap2430-mcbsp"; 27 compatible = "ti,omap2430-mcbsp";
19 reg = <0x48074000 0xff>; 28 reg = <0x48074000 0xff>;
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 05c26c4f6606..f38ea8771b44 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -68,6 +68,24 @@
68 reg = <0x48200000 0x1000>; 68 reg = <0x48200000 0x1000>;
69 }; 69 };
70 70
71 omap3_pmx_core: pinmux@48002030 {
72 compatible = "ti,omap3-padconf", "pinctrl-single";
73 reg = <0x48002030 0x05cc>;
74 #address-cells = <1>;
75 #size-cells = <0>;
76 pinctrl-single,register-width = <16>;
77 pinctrl-single,function-mask = <0x7fff>;
78 };
79
80 omap3_pmx_wkup: pinmux@0x48002a58 {
81 compatible = "ti,omap3-padconf", "pinctrl-single";
82 reg = <0x48002a58 0x5c>;
83 #address-cells = <1>;
84 #size-cells = <0>;
85 pinctrl-single,register-width = <16>;
86 pinctrl-single,function-mask = <0x7fff>;
87 };
88
71 gpio1: gpio@48310000 { 89 gpio1: gpio@48310000 {
72 compatible = "ti,omap3-gpio"; 90 compatible = "ti,omap3-gpio";
73 ti,hwmods = "gpio1"; 91 ti,hwmods = "gpio1";
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 75095e306d77..5d1c48459e6e 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -95,6 +95,23 @@
95 ranges; 95 ranges;
96 ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3"; 96 ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
97 97
98 omap4_pmx_core: pinmux@4a100040 {
99 compatible = "ti,omap4-padconf", "pinctrl-single";
100 reg = <0x4a100040 0x0196>;
101 #address-cells = <1>;
102 #size-cells = <0>;
103 pinctrl-single,register-width = <16>;
104 pinctrl-single,function-mask = <0x7fff>;
105 };
106 omap4_pmx_wkup: pinmux@4a31e040 {
107 compatible = "ti,omap4-padconf", "pinctrl-single";
108 reg = <0x4a31e040 0x0038>;
109 #address-cells = <1>;
110 #size-cells = <0>;
111 pinctrl-single,register-width = <16>;
112 pinctrl-single,function-mask = <0x7fff>;
113 };
114
98 gpio1: gpio@4a310000 { 115 gpio1: gpio@4a310000 {
99 compatible = "ti,omap4-gpio"; 116 compatible = "ti,omap4-gpio";
100 reg = <0x4a310000 0x200>; 117 reg = <0x4a310000 0x200>;