diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-08-12 10:22:33 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-09-11 04:26:52 -0400 |
commit | 072480426ba9b5a0d68d91006fdb07fd568ef6ad (patch) | |
tree | e345f36a4ec4584fc982133af8c42928f725dfce | |
parent | 327a79c01e45e269da33af1500cd7da8a24c3ba4 (diff) |
ARM: dts: imx53-smd: add pinctrl settings
Add pinctrl settings for the exsiting devices in imx53-smd.dts.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/imx53-smd.dts | 38 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53.dtsi | 33 |
2 files changed, 69 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts index 8cdf0a2b0ff3..06c68580c842 100644 --- a/arch/arm/boot/dts/imx53-smd.dts +++ b/arch/arm/boot/dts/imx53-smd.dts | |||
@@ -25,22 +25,30 @@ | |||
25 | aips@50000000 { /* AIPS1 */ | 25 | aips@50000000 { /* AIPS1 */ |
26 | spba@50000000 { | 26 | spba@50000000 { |
27 | esdhc@50004000 { /* ESDHC1 */ | 27 | esdhc@50004000 { /* ESDHC1 */ |
28 | pinctrl-names = "default"; | ||
29 | pinctrl-0 = <&pinctrl_esdhc1_1>; | ||
28 | cd-gpios = <&gpio3 13 0>; | 30 | cd-gpios = <&gpio3 13 0>; |
29 | wp-gpios = <&gpio4 11 0>; | 31 | wp-gpios = <&gpio4 11 0>; |
30 | status = "okay"; | 32 | status = "okay"; |
31 | }; | 33 | }; |
32 | 34 | ||
33 | esdhc@50008000 { /* ESDHC2 */ | 35 | esdhc@50008000 { /* ESDHC2 */ |
36 | pinctrl-names = "default"; | ||
37 | pinctrl-0 = <&pinctrl_esdhc2_1>; | ||
34 | non-removable; | 38 | non-removable; |
35 | status = "okay"; | 39 | status = "okay"; |
36 | }; | 40 | }; |
37 | 41 | ||
38 | uart3: serial@5000c000 { | 42 | uart3: serial@5000c000 { |
43 | pinctrl-names = "default"; | ||
44 | pinctrl-0 = <&pinctrl_uart3_1>; | ||
39 | fsl,uart-has-rtscts; | 45 | fsl,uart-has-rtscts; |
40 | status = "okay"; | 46 | status = "okay"; |
41 | }; | 47 | }; |
42 | 48 | ||
43 | ecspi@50010000 { /* ECSPI1 */ | 49 | ecspi@50010000 { /* ECSPI1 */ |
50 | pinctrl-names = "default"; | ||
51 | pinctrl-0 = <&pinctrl_ecspi1_1>; | ||
44 | fsl,spi-num-chipselects = <2>; | 52 | fsl,spi-num-chipselects = <2>; |
45 | cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>; | 53 | cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>; |
46 | status = "okay"; | 54 | status = "okay"; |
@@ -72,27 +80,49 @@ | |||
72 | }; | 80 | }; |
73 | 81 | ||
74 | esdhc@50020000 { /* ESDHC3 */ | 82 | esdhc@50020000 { /* ESDHC3 */ |
83 | pinctrl-names = "default"; | ||
84 | pinctrl-0 = <&pinctrl_esdhc3_1>; | ||
75 | non-removable; | 85 | non-removable; |
76 | status = "okay"; | 86 | status = "okay"; |
77 | }; | 87 | }; |
78 | }; | 88 | }; |
79 | 89 | ||
80 | iomuxc@53fa8000 { | 90 | iomuxc@53fa8000 { |
81 | compatible = "fsl,imx53-iomuxc-smd"; | 91 | pinctrl-names = "default"; |
82 | reg = <0x53fa8000 0x4000>; | 92 | pinctrl-0 = <&pinctrl_hog>; |
93 | |||
94 | hog { | ||
95 | pinctrl_hog: hoggrp { | ||
96 | fsl,pins = < | ||
97 | 982 0x80000000 /* MX53_PAD_PATA_DATA14__GPIO2_14 */ | ||
98 | 989 0x80000000 /* MX53_PAD_PATA_DATA15__GPIO2_15 */ | ||
99 | 424 0x80000000 /* MX53_PAD_EIM_EB2__GPIO2_30 */ | ||
100 | 701 0x80000000 /* MX53_PAD_EIM_DA13__GPIO3_13 */ | ||
101 | 449 0x80000000 /* MX53_PAD_EIM_D19__GPIO3_19 */ | ||
102 | 43 0x80000000 /* MX53_PAD_KEY_ROW2__GPIO4_11 */ | ||
103 | 868 0x80000000 /* MX53_PAD_PATA_DA_0__GPIO7_6 */ | ||
104 | >; | ||
105 | }; | ||
106 | }; | ||
83 | }; | 107 | }; |
84 | 108 | ||
85 | uart1: serial@53fbc000 { | 109 | uart1: serial@53fbc000 { |
110 | pinctrl-names = "default"; | ||
111 | pinctrl-0 = <&pinctrl_uart1_1>; | ||
86 | status = "okay"; | 112 | status = "okay"; |
87 | }; | 113 | }; |
88 | 114 | ||
89 | uart2: serial@53fc0000 { | 115 | uart2: serial@53fc0000 { |
116 | pinctrl-names = "default"; | ||
117 | pinctrl-0 = <&pinctrl_uart2_1>; | ||
90 | status = "okay"; | 118 | status = "okay"; |
91 | }; | 119 | }; |
92 | }; | 120 | }; |
93 | 121 | ||
94 | aips@60000000 { /* AIPS2 */ | 122 | aips@60000000 { /* AIPS2 */ |
95 | i2c@63fc4000 { /* I2C2 */ | 123 | i2c@63fc4000 { /* I2C2 */ |
124 | pinctrl-names = "default"; | ||
125 | pinctrl-0 = <&pinctrl_i2c2_1>; | ||
96 | status = "okay"; | 126 | status = "okay"; |
97 | 127 | ||
98 | codec: sgtl5000@0a { | 128 | codec: sgtl5000@0a { |
@@ -112,6 +142,8 @@ | |||
112 | }; | 142 | }; |
113 | 143 | ||
114 | i2c@63fc8000 { /* I2C1 */ | 144 | i2c@63fc8000 { /* I2C1 */ |
145 | pinctrl-names = "default"; | ||
146 | pinctrl-0 = <&pinctrl_i2c1_1>; | ||
115 | status = "okay"; | 147 | status = "okay"; |
116 | 148 | ||
117 | accelerometer: mma8450@1c { | 149 | accelerometer: mma8450@1c { |
@@ -131,6 +163,8 @@ | |||
131 | }; | 163 | }; |
132 | 164 | ||
133 | ethernet@63fec000 { | 165 | ethernet@63fec000 { |
166 | pinctrl-names = "default"; | ||
167 | pinctrl-0 = <&pinctrl_fec_1>; | ||
134 | phy-mode = "rmii"; | 168 | phy-mode = "rmii"; |
135 | phy-reset-gpios = <&gpio7 6 0>; | 169 | phy-reset-gpios = <&gpio7 6 0>; |
136 | status = "okay"; | 170 | status = "okay"; |
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index c08bec5a8400..221cf3321b0a 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi | |||
@@ -286,6 +286,19 @@ | |||
286 | }; | 286 | }; |
287 | }; | 287 | }; |
288 | 288 | ||
289 | esdhc2 { | ||
290 | pinctrl_esdhc2_1: esdhc2grp-1 { | ||
291 | fsl,pins = < | ||
292 | 1038 0x1d5 /* MX53_PAD_SD2_CMD__ESDHC2_CMD */ | ||
293 | 1032 0x1d5 /* MX53_PAD_SD2_CLK__ESDHC2_CLK */ | ||
294 | 1062 0x1d5 /* MX53_PAD_SD2_DATA0__ESDHC2_DAT0 */ | ||
295 | 1056 0x1d5 /* MX53_PAD_SD2_DATA1__ESDHC2_DAT1 */ | ||
296 | 1050 0x1d5 /* MX53_PAD_SD2_DATA2__ESDHC2_DAT2 */ | ||
297 | 1044 0x1d5 /* MX53_PAD_SD2_DATA3__ESDHC2_DAT3 */ | ||
298 | >; | ||
299 | }; | ||
300 | }; | ||
301 | |||
289 | esdhc3 { | 302 | esdhc3 { |
290 | pinctrl_esdhc3_1: esdhc3grp-1 { | 303 | pinctrl_esdhc3_1: esdhc3grp-1 { |
291 | fsl,pins = < | 304 | fsl,pins = < |
@@ -336,6 +349,26 @@ | |||
336 | >; | 349 | >; |
337 | }; | 350 | }; |
338 | }; | 351 | }; |
352 | |||
353 | uart2 { | ||
354 | pinctrl_uart2_1: uart2grp-1 { | ||
355 | fsl,pins = < | ||
356 | 841 0x1c5 /* MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX */ | ||
357 | 836 0x1c5 /* MX53_PAD_PATA_DMARQ__UART2_TXD_MUX */ | ||
358 | >; | ||
359 | }; | ||
360 | }; | ||
361 | |||
362 | uart3 { | ||
363 | pinctrl_uart3_1: uart3grp-1 { | ||
364 | fsl,pins = < | ||
365 | 884 0x1c5 /* MX53_PAD_PATA_CS_0__UART3_TXD_MUX */ | ||
366 | 888 0x1c5 /* MX53_PAD_PATA_CS_1__UART3_RXD_MUX */ | ||
367 | 875 0x1c5 /* MX53_PAD_PATA_DA_1__UART3_CTS */ | ||
368 | 880 0x1c5 /* MX53_PAD_PATA_DA_2__UART3_RTS */ | ||
369 | >; | ||
370 | }; | ||
371 | }; | ||
339 | }; | 372 | }; |
340 | 373 | ||
341 | uart1: serial@53fbc000 { | 374 | uart1: serial@53fbc000 { |