aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/omap2.dtsi1
-rw-r--r--arch/arm/boot/dts/omap3-beagle.dts24
-rw-r--r--arch/arm/boot/dts/omap3-igep.dtsi34
-rw-r--r--arch/arm/boot/dts/omap3.dtsi1
-rw-r--r--arch/arm/boot/dts/omap4-panda-a4.dts6
-rw-r--r--arch/arm/boot/dts/omap4-panda-common.dtsi54
-rw-r--r--arch/arm/boot/dts/omap4-panda-es.dts6
-rw-r--r--arch/arm/boot/dts/omap4-sdp-es23plus.dts6
-rw-r--r--arch/arm/boot/dts/omap4-sdp.dts98
-rw-r--r--arch/arm/boot/dts/omap4.dtsi1
-rw-r--r--arch/arm/boot/dts/omap5-evm.dts88
-rw-r--r--arch/arm/boot/dts/omap5.dtsi1
12 files changed, 162 insertions, 158 deletions
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index f39b237b9011..b3cc896af6eb 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -9,6 +9,7 @@
9 */ 9 */
10 10
11#include <dt-bindings/gpio/gpio.h> 11#include <dt-bindings/gpio/gpio.h>
12#include <dt-bindings/pinctrl/omap.h>
12 13
13#include "skeleton.dtsi" 14#include "skeleton.dtsi"
14 15
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 434288f30078..6d47c4b72bc5 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -81,18 +81,18 @@
81 81
82 hsusbb2_pins: pinmux_hsusbb2_pins { 82 hsusbb2_pins: pinmux_hsusbb2_pins {
83 pinctrl-single,pins = < 83 pinctrl-single,pins = <
84 0x5c0 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_clk OUTPUT */ 84 0x5c0 (PIN_OUTPUT | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_clk */
85 0x5c2 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_stp OUTPUT */ 85 0x5c2 (PIN_OUTPUT | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_stp */
86 0x5c4 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dir INPUT | PULLDOWN */ 86 0x5c4 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dir */
87 0x5c6 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_nxt INPUT | PULLDOWN */ 87 0x5c6 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_nxt */
88 0x5c8 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat0 INPUT | PULLDOWN */ 88 0x5c8 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat0 */
89 0x5cA 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat1 INPUT | PULLDOWN */ 89 0x5cA (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat1 */
90 0x1a4 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat2 INPUT | PULLDOWN */ 90 0x1a4 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat2 */
91 0x1a6 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat3 INPUT | PULLDOWN */ 91 0x1a6 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat3 */
92 0x1a8 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat4 INPUT | PULLDOWN */ 92 0x1a8 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat4 */
93 0x1aa 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat5 INPUT | PULLDOWN */ 93 0x1aa (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat5 */
94 0x1ac 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat6 INPUT | PULLDOWN */ 94 0x1ac (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat6 */
95 0x1ae 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat7 INPUT | PULLDOWN */ 95 0x1ae (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat7 */
96 >; 96 >;
97 }; 97 };
98}; 98};
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index d1d2ba7a9390..5224c291461f 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -29,43 +29,43 @@
29&omap3_pmx_core { 29&omap3_pmx_core {
30 uart1_pins: pinmux_uart1_pins { 30 uart1_pins: pinmux_uart1_pins {
31 pinctrl-single,pins = < 31 pinctrl-single,pins = <
32 0x152 0x100 /* uart1_rx.uart1_rx INPUT | MODE0 */ 32 0x152 (PIN_INPUT | MUX_MODE0) /* uart1_rx.uart1_rx */
33 0x14c 0 /* uart1_tx.uart1_tx OUTPUT | MODE0 */ 33 0x14c (PIN_OUTPUT |MUX_MODE0) /* uart1_tx.uart1_tx */
34 >; 34 >;
35 }; 35 };
36 36
37 uart2_pins: pinmux_uart2_pins { 37 uart2_pins: pinmux_uart2_pins {
38 pinctrl-single,pins = < 38 pinctrl-single,pins = <
39 0x14a 0x100 /* uart2_rx.uart2_rx INPUT | MODE0 */ 39 0x14a (PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
40 0x148 0 /* uart2_tx.uart2_tx OUTPUT | MODE0 */ 40 0x148 (PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
41 >; 41 >;
42 }; 42 };
43 43
44 uart3_pins: pinmux_uart3_pins { 44 uart3_pins: pinmux_uart3_pins {
45 pinctrl-single,pins = < 45 pinctrl-single,pins = <
46 0x16e 0x100 /* uart3_rx.uart3_rx INPUT | MODE0 */ 46 0x16e (PIN_INPUT | MUX_MODE0) /* uart3_rx.uart3_rx */
47 0x170 0 /* uart3_tx.uart3_tx OUTPUT | MODE0 */ 47 0x170 (PIN_OUTPUT | MUX_MODE0) /* uart3_tx.uart3_tx */
48 >; 48 >;
49 }; 49 };
50 50
51 mmc1_pins: pinmux_mmc1_pins { 51 mmc1_pins: pinmux_mmc1_pins {
52 pinctrl-single,pins = < 52 pinctrl-single,pins = <
53 0x114 0x0118 /* sdmmc1_clk.sdmmc1_clk INPUT PULLUP | MODE 0 */ 53 0x114 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */
54 0x116 0x0118 /* sdmmc1_cmd.sdmmc1_cmd INPUT PULLUP | MODE 0 */ 54 0x116 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */
55 0x118 0x0118 /* sdmmc1_dat0.sdmmc1_dat0 INPUT PULLUP | MODE 0 */ 55 0x118 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */
56 0x11a 0x0118 /* sdmmc1_dat1.sdmmc1_dat1 INPUT PULLUP | MODE 0 */ 56 0x11a (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */
57 0x11c 0x0118 /* sdmmc1_dat2.sdmmc1_dat2 INPUT PULLUP | MODE 0 */ 57 0x11c (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */
58 0x11e 0x0118 /* sdmmc1_dat3.sdmmc1_dat3 INPUT PULLUP | MODE 0 */ 58 0x11e (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */
59 0x120 0x0100 /* sdmmc1_dat4.sdmmc1_dat4 INPUT | MODE 0 */ 59 0x120 (PIN_INPUT | MUX_MODE0) /* sdmmc1_dat4.sdmmc1_dat4 */
60 0x122 0x0100 /* sdmmc1_dat5.sdmmc1_dat5 INPUT | MODE 0 */ 60 0x122 (PIN_INPUT | MUX_MODE0) /* sdmmc1_dat5.sdmmc1_dat5 */
61 0x124 0x0100 /* sdmmc1_dat6.sdmmc1_dat6 INPUT | MODE 0 */ 61 0x124 (PIN_INPUT | MUX_MODE0) /* sdmmc1_dat6.sdmmc1_dat6 */
62 0x126 0x0100 /* sdmmc1_dat7.sdmmc1_dat7 INPUT | MODE 0 */ 62 0x126 (PIN_INPUT | MUX_MODE0) /* sdmmc1_dat7.sdmmc1_dat7 */
63 >; 63 >;
64 }; 64 };
65 65
66 smsc911x_pins: pinmux_smsc911x_pins { 66 smsc911x_pins: pinmux_smsc911x_pins {
67 pinctrl-single,pins = < 67 pinctrl-single,pins = <
68 0x1a2 0x0104 /* mcspi1_cs2.gpio_176 INPUT | MODE4 */ 68 0x1a2 (PIN_INPUT | MUX_MODE4) /* mcspi1_cs2.gpio_176 */
69 >; 69 >;
70 }; 70 };
71}; 71};
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index fac923b0afd4..6d05ee09b3f2 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -9,6 +9,7 @@
9 */ 9 */
10 10
11#include <dt-bindings/gpio/gpio.h> 11#include <dt-bindings/gpio/gpio.h>
12#include <dt-bindings/pinctrl/omap.h>
12 13
13#include "skeleton.dtsi" 14#include "skeleton.dtsi"
14 15
diff --git a/arch/arm/boot/dts/omap4-panda-a4.dts b/arch/arm/boot/dts/omap4-panda-a4.dts
index f18fb5c25395..133f1b74e8ae 100644
--- a/arch/arm/boot/dts/omap4-panda-a4.dts
+++ b/arch/arm/boot/dts/omap4-panda-a4.dts
@@ -13,8 +13,8 @@
13/* Pandaboard Rev A4+ have external pullups on SCL & SDA */ 13/* Pandaboard Rev A4+ have external pullups on SCL & SDA */
14&dss_hdmi_pins { 14&dss_hdmi_pins {
15 pinctrl-single,pins = < 15 pinctrl-single,pins = <
16 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ 16 0x5a (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_cec.hdmi_cec */
17 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ 17 0x5c (PIN_INPUT | MUX_MODE0) /* hdmi_scl.hdmi_scl */
18 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ 18 0x5e (PIN_INPUT | MUX_MODE0) /* hdmi_sda.hdmi_sda */
19 >; 19 >;
20}; 20};
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 8d09cf55925d..d5d144a1a6c2 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -64,7 +64,7 @@
64 64
65 twl6030_wkup_pins: pinmux_twl6030_wkup_pins { 65 twl6030_wkup_pins: pinmux_twl6030_wkup_pins {
66 pinctrl-single,pins = < 66 pinctrl-single,pins = <
67 0x14 0x2 /* fref_clk0_out.sys_drm_msecure OUTPUT | MODE2 */ 67 0x14 (PIN_OUTPUT | MUX_MODE2) /* fref_clk0_out.sys_drm_msecure */
68 >; 68 >;
69 }; 69 };
70}; 70};
@@ -82,77 +82,77 @@
82 82
83 twl6030_pins: pinmux_twl6030_pins { 83 twl6030_pins: pinmux_twl6030_pins {
84 pinctrl-single,pins = < 84 pinctrl-single,pins = <
85 0x15e 0x4118 /* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */ 85 0x15e (WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0) /* sys_nirq1.sys_nirq1 */
86 >; 86 >;
87 }; 87 };
88 88
89 twl6040_pins: pinmux_twl6040_pins { 89 twl6040_pins: pinmux_twl6040_pins {
90 pinctrl-single,pins = < 90 pinctrl-single,pins = <
91 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ 91 0xe0 (PIN_OUTPUT | MUX_MODE3) /* hdq_sio.gpio_127 */
92 0x160 0x100 /* sys_nirq2.sys_nirq2 INPUT | MODE0 */ 92 0x160 (PIN_INPUT | MUX_MODE0) /* sys_nirq2.sys_nirq2 */
93 >; 93 >;
94 }; 94 };
95 95
96 mcpdm_pins: pinmux_mcpdm_pins { 96 mcpdm_pins: pinmux_mcpdm_pins {
97 pinctrl-single,pins = < 97 pinctrl-single,pins = <
98 0xc6 0x108 /* abe_pdm_ul_data.abe_pdm_ul_data INPUT PULLDOWN | MODE0 */ 98 0xc6 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_pdm_ul_data.abe_pdm_ul_data */
99 0xc8 0x108 /* abe_pdm_dl_data.abe_pdm_dl_data INPUT PULLDOWN | MODE0 */ 99 0xc8 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_pdm_dl_data.abe_pdm_dl_data */
100 0xca 0x118 /* abe_pdm_frame.abe_pdm_frame INPUT PULLUP | MODE0 */ 100 0xca (PIN_INPUT_PULLUP | MUX_MODE0) /* abe_pdm_frame.abe_pdm_frame */
101 0xcc 0x108 /* abe_pdm_lb_clk.abe_pdm_lb_clk INPUT PULLDOWN | MODE0 */ 101 0xcc (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_pdm_lb_clk.abe_pdm_lb_clk */
102 0xce 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */ 102 0xce (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_clks.abe_clks */
103 >; 103 >;
104 }; 104 };
105 105
106 mcbsp1_pins: pinmux_mcbsp1_pins { 106 mcbsp1_pins: pinmux_mcbsp1_pins {
107 pinctrl-single,pins = < 107 pinctrl-single,pins = <
108 0xbe 0x100 /* abe_mcbsp1_clkx.abe_mcbsp1_clkx INPUT | MODE0 */ 108 0xbe (PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_clkx.abe_mcbsp1_clkx */
109 0xc0 0x108 /* abe_mcbsp1_dr.abe_mcbsp1_dr INPUT PULLDOWN | MODE0 */ 109 0xc0 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp1_dr.abe_mcbsp1_dr */
110 0xc2 0x8 /* abe_mcbsp1_dx.abe_mcbsp1_dx OUTPUT PULLDOWN | MODE0 */ 110 0xc2 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp1_dx.abe_mcbsp1_dx */
111 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ 111 0xc4 (PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_fsx.abe_mcbsp1_fsx */
112 >; 112 >;
113 }; 113 };
114 114
115 dss_hdmi_pins: pinmux_dss_hdmi_pins { 115 dss_hdmi_pins: pinmux_dss_hdmi_pins {
116 pinctrl-single,pins = < 116 pinctrl-single,pins = <
117 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ 117 0x5a (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_cec.hdmi_cec */
118 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */ 118 0x5c (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_scl.hdmi_scl */
119 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */ 119 0x5e (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_sda.hdmi_sda */
120 >; 120 >;
121 }; 121 };
122 122
123 tpd12s015_pins: pinmux_tpd12s015_pins { 123 tpd12s015_pins: pinmux_tpd12s015_pins {
124 pinctrl-single,pins = < 124 pinctrl-single,pins = <
125 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */ 125 0x22 (PIN_OUTPUT | MUX_MODE3) /* gpmc_a17.gpio_41 */
126 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */ 126 0x48 (PIN_OUTPUT | MUX_MODE3) /* gpmc_nbe1.gpio_60 */
127 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ 127 0x58 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* hdmi_hpd.gpio_63 */
128 >; 128 >;
129 }; 129 };
130 130
131 i2c1_pins: pinmux_i2c1_pins { 131 i2c1_pins: pinmux_i2c1_pins {
132 pinctrl-single,pins = < 132 pinctrl-single,pins = <
133 0xe2 0x118 /* i2c1_scl PULLUP | INPUTENABLE | MODE0 */ 133 0xe2 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */
134 0xe4 0x118 /* i2c1_sda PULLUP | INPUTENABLE | MODE0 */ 134 0xe4 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */
135 >; 135 >;
136 }; 136 };
137 137
138 i2c2_pins: pinmux_i2c2_pins { 138 i2c2_pins: pinmux_i2c2_pins {
139 pinctrl-single,pins = < 139 pinctrl-single,pins = <
140 0xe6 0x118 /* i2c2_scl PULLUP | INPUTENABLE | MODE0 */ 140 0xe6 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_scl */
141 0xe8 0x118 /* i2c2_sda PULLUP | INPUTENABLE | MODE0 */ 141 0xe8 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_sda */
142 >; 142 >;
143 }; 143 };
144 144
145 i2c3_pins: pinmux_i2c3_pins { 145 i2c3_pins: pinmux_i2c3_pins {
146 pinctrl-single,pins = < 146 pinctrl-single,pins = <
147 0xea 0x118 /* i2c3_scl PULLUP | INPUTENABLE | MODE0 */ 147 0xea (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */
148 0xec 0x118 /* i2c3_sda PULLUP | INPUTENABLE | MODE0 */ 148 0xec (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */
149 >; 149 >;
150 }; 150 };
151 151
152 i2c4_pins: pinmux_i2c4_pins { 152 i2c4_pins: pinmux_i2c4_pins {
153 pinctrl-single,pins = < 153 pinctrl-single,pins = <
154 0xee 0x118 /* i2c4_scl PULLUP | INPUTENABLE | MODE0 */ 154 0xee (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_scl */
155 0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */ 155 0xf0 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */
156 >; 156 >;
157 }; 157 };
158}; 158};
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts
index c6f012ed2a1c..5cfdf194252f 100644
--- a/arch/arm/boot/dts/omap4-panda-es.dts
+++ b/arch/arm/boot/dts/omap4-panda-es.dts
@@ -29,8 +29,8 @@
29/* PandaboardES has external pullups on SCL & SDA */ 29/* PandaboardES has external pullups on SCL & SDA */
30&dss_hdmi_pins { 30&dss_hdmi_pins {
31 pinctrl-single,pins = < 31 pinctrl-single,pins = <
32 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ 32 0x5a (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_cec.hdmi_cec */
33 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ 33 0x5c (PIN_INPUT | MUX_MODE0) /* hdmi_scl.hdmi_scl */
34 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ 34 0x5e (PIN_INPUT | MUX_MODE0) /* hdmi_sda.hdmi_sda */
35 >; 35 >;
36}; 36};
diff --git a/arch/arm/boot/dts/omap4-sdp-es23plus.dts b/arch/arm/boot/dts/omap4-sdp-es23plus.dts
index 4f26355bfed1..aad5dda0f469 100644
--- a/arch/arm/boot/dts/omap4-sdp-es23plus.dts
+++ b/arch/arm/boot/dts/omap4-sdp-es23plus.dts
@@ -10,8 +10,8 @@
10/* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */ 10/* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */
11&dss_hdmi_pins { 11&dss_hdmi_pins {
12 pinctrl-single,pins = < 12 pinctrl-single,pins = <
13 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ 13 0x5a (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_cec.hdmi_cec */
14 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ 14 0x5c (PIN_INPUT | MUX_MODE0) /* hdmi_scl.hdmi_scl */
15 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ 15 0x5e (PIN_INPUT | MUX_MODE0) /* hdmi_sda.hdmi_sda */
16 >; 16 >;
17}; 17};
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index e9df3ea35834..7951b4ea500a 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -150,7 +150,7 @@
150 150
151 twl6030_wkup_pins: pinmux_twl6030_wkup_pins { 151 twl6030_wkup_pins: pinmux_twl6030_wkup_pins {
152 pinctrl-single,pins = < 152 pinctrl-single,pins = <
153 0x14 0x2 /* fref_clk0_out.sys_drm_msecure OUTPUT | MODE2 */ 153 0x14 (PIN_OUTPUT | MUX_MODE2) /* fref_clk0_out.sys_drm_msecure */
154 >; 154 >;
155 }; 155 };
156}; 156};
@@ -170,129 +170,129 @@
170 170
171 uart2_pins: pinmux_uart2_pins { 171 uart2_pins: pinmux_uart2_pins {
172 pinctrl-single,pins = < 172 pinctrl-single,pins = <
173 0xd8 0x118 /* uart2_cts.uart2_cts INPUT_PULLUP | MODE0 */ 173 0xd8 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts */
174 0xda 0 /* uart2_rts.uart2_rts OUTPUT | MODE0 */ 174 0xda (PIN_OUTPUT | MUX_MODE0) /* uart2_rts.uart2_rts */
175 0xdc 0x118 /* uart2_rx.uart2_rx INPUT_PULLUP | MODE0 */ 175 0xdc (PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_rx.uart2_rx */
176 0xde 0 /* uart2_tx.uart2_tx OUTPUT | MODE0 */ 176 0xde (PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
177 >; 177 >;
178 }; 178 };
179 179
180 uart3_pins: pinmux_uart3_pins { 180 uart3_pins: pinmux_uart3_pins {
181 pinctrl-single,pins = < 181 pinctrl-single,pins = <
182 0x100 0x118 /* uart3_cts_rctx.uart3_cts_rctx INPUT_PULLUP | MODE0 */ 182 0x100 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart3_cts_rctx.uart3_cts_rctx */
183 0x102 0 /* uart3_rts_sd.uart3_rts_sd OUTPUT | MODE0 */ 183 0x102 (PIN_OUTPUT | MUX_MODE0) /* uart3_rts_sd.uart3_rts_sd */
184 0x104 0x100 /* uart3_rx_irrx.uart3_rx_irrx INPUT | MODE0 */ 184 0x104 (PIN_INPUT | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
185 0x106 0 /* uart3_tx_irtx.uart3_tx_irtx OUTPUT | MODE0 */ 185 0x106 (PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */
186 >; 186 >;
187 }; 187 };
188 188
189 uart4_pins: pinmux_uart4_pins { 189 uart4_pins: pinmux_uart4_pins {
190 pinctrl-single,pins = < 190 pinctrl-single,pins = <
191 0x11c 0x100 /* uart4_rx.uart4_rx INPUT | MODE0 */ 191 0x11c (PIN_INPUT | MUX_MODE0) /* uart4_rx.uart4_rx */
192 0x11e 0 /* uart4_tx.uart4_tx OUTPUT | MODE0 */ 192 0x11e (PIN_OUTPUT | MUX_MODE0) /* uart4_tx.uart4_tx */
193 >; 193 >;
194 }; 194 };
195 195
196 twl6030_pins: pinmux_twl6030_pins { 196 twl6030_pins: pinmux_twl6030_pins {
197 pinctrl-single,pins = < 197 pinctrl-single,pins = <
198 0x15e 0x4118 /* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */ 198 0x15e (WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0) /* sys_nirq1.sys_nirq1 */
199 >; 199 >;
200 }; 200 };
201 201
202 twl6040_pins: pinmux_twl6040_pins { 202 twl6040_pins: pinmux_twl6040_pins {
203 pinctrl-single,pins = < 203 pinctrl-single,pins = <
204 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ 204 0xe0 (PIN_OUTPUT | MUX_MODE3) /* hdq_sio.gpio_127 */
205 0x160 0x100 /* sys_nirq2.sys_nirq2 INPUT | MODE0 */ 205 0x160 (PIN_INPUT | MUX_MODE0) /* sys_nirq2.sys_nirq2 */
206 >; 206 >;
207 }; 207 };
208 208
209 mcpdm_pins: pinmux_mcpdm_pins { 209 mcpdm_pins: pinmux_mcpdm_pins {
210 pinctrl-single,pins = < 210 pinctrl-single,pins = <
211 0xc6 0x108 /* abe_pdm_ul_data.abe_pdm_ul_data INPUT PULLDOWN | MODE0 */ 211 0xc6 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_pdm_ul_data.abe_pdm_ul_data */
212 0xc8 0x108 /* abe_pdm_dl_data.abe_pdm_dl_data INPUT PULLDOWN | MODE0 */ 212 0xc8 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_pdm_dl_data.abe_pdm_dl_data */
213 0xca 0x118 /* abe_pdm_frame.abe_pdm_frame INPUT PULLUP | MODE0 */ 213 0xca (PIN_INPUT_PULLUP | MUX_MODE0) /* abe_pdm_frame.abe_pdm_frame */
214 0xcc 0x108 /* abe_pdm_lb_clk.abe_pdm_lb_clk INPUT PULLDOWN | MODE0 */ 214 0xcc (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_pdm_lb_clk.abe_pdm_lb_clk */
215 0xce 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */ 215 0xce (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_clks.abe_clks */
216 >; 216 >;
217 }; 217 };
218 218
219 dmic_pins: pinmux_dmic_pins { 219 dmic_pins: pinmux_dmic_pins {
220 pinctrl-single,pins = < 220 pinctrl-single,pins = <
221 0xd0 0 /* abe_dmic_clk1.abe_dmic_clk1 OUTPUT | MODE0 */ 221 0xd0 (PIN_OUTPUT | MUX_MODE0) /* abe_dmic_clk1.abe_dmic_clk1 */
222 0xd2 0x100 /* abe_dmic_din1.abe_dmic_din1 INPUT | MODE0 */ 222 0xd2 (PIN_INPUT | MUX_MODE0) /* abe_dmic_din1.abe_dmic_din1 */
223 0xd4 0x100 /* abe_dmic_din2.abe_dmic_din2 INPUT | MODE0 */ 223 0xd4 (PIN_INPUT | MUX_MODE0) /* abe_dmic_din2.abe_dmic_din2 */
224 0xd6 0x100 /* abe_dmic_din3.abe_dmic_din3 INPUT | MODE0 */ 224 0xd6 (PIN_INPUT | MUX_MODE0) /* abe_dmic_din3.abe_dmic_din3 */
225 >; 225 >;
226 }; 226 };
227 227
228 mcbsp1_pins: pinmux_mcbsp1_pins { 228 mcbsp1_pins: pinmux_mcbsp1_pins {
229 pinctrl-single,pins = < 229 pinctrl-single,pins = <
230 0xbe 0x100 /* abe_mcbsp1_clkx.abe_mcbsp1_clkx INPUT | MODE0 */ 230 0xbe (PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_clkx.abe_mcbsp1_clkx */
231 0xc0 0x108 /* abe_mcbsp1_dr.abe_mcbsp1_dr INPUT PULLDOWN | MODE0 */ 231 0xc0 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp1_dr.abe_mcbsp1_dr */
232 0xc2 0x8 /* abe_mcbsp1_dx.abe_mcbsp1_dx OUTPUT PULLDOWN | MODE0 */ 232 0xc2 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp1_dx.abe_mcbsp1_dx */
233 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ 233 0xc4 (PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_fsx.abe_mcbsp1_fsx */
234 >; 234 >;
235 }; 235 };
236 236
237 mcbsp2_pins: pinmux_mcbsp2_pins { 237 mcbsp2_pins: pinmux_mcbsp2_pins {
238 pinctrl-single,pins = < 238 pinctrl-single,pins = <
239 0xb6 0x100 /* abe_mcbsp2_clkx.abe_mcbsp2_clkx INPUT | MODE0 */ 239 0xb6 (PIN_INPUT | MUX_MODE0) /* abe_mcbsp2_clkx.abe_mcbsp2_clkx */
240 0xb8 0x108 /* abe_mcbsp2_dr.abe_mcbsp2_dr INPUT PULLDOWN | MODE0 */ 240 0xb8 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp2_dr.abe_mcbsp2_dr */
241 0xba 0x8 /* abe_mcbsp2_dx.abe_mcbsp2_dx OUTPUT PULLDOWN | MODE0 */ 241 0xba (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp2_dx.abe_mcbsp2_dx */
242 0xbc 0x100 /* abe_mcbsp2_fsx.abe_mcbsp2_fsx INPUT | MODE0 */ 242 0xbc (PIN_INPUT | MUX_MODE0) /* abe_mcbsp2_fsx.abe_mcbsp2_fsx */
243 >; 243 >;
244 }; 244 };
245 245
246 mcspi1_pins: pinmux_mcspi1_pins { 246 mcspi1_pins: pinmux_mcspi1_pins {
247 pinctrl-single,pins = < 247 pinctrl-single,pins = <
248 0xf2 0x100 /* mcspi1_clk.mcspi1_clk INPUT | MODE0 */ 248 0xf2 (PIN_INPUT | MUX_MODE0) /* mcspi1_clk.mcspi1_clk */
249 0xf4 0x100 /* mcspi1_somi.mcspi1_somi INPUT | MODE0 */ 249 0xf4 (PIN_INPUT | MUX_MODE0) /* mcspi1_somi.mcspi1_somi */
250 0xf6 0x100 /* mcspi1_simo.mcspi1_simo INPUT | MODE0 */ 250 0xf6 (PIN_INPUT | MUX_MODE0) /* mcspi1_simo.mcspi1_simo */
251 0xf8 0x100 /* mcspi1_cs0.mcspi1_cs0 INPUT | MODE0*/ 251 0xf8 (PIN_INPUT | MUX_MODE0) /* mcspi1_cs0.mcspi1_cs0 */
252 >; 252 >;
253 }; 253 };
254 254
255 dss_hdmi_pins: pinmux_dss_hdmi_pins { 255 dss_hdmi_pins: pinmux_dss_hdmi_pins {
256 pinctrl-single,pins = < 256 pinctrl-single,pins = <
257 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ 257 0x5a (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_cec.hdmi_cec */
258 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */ 258 0x5c (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_scl.hdmi_scl */
259 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */ 259 0x5e (PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_sda.hdmi_sda */
260 >; 260 >;
261 }; 261 };
262 262
263 tpd12s015_pins: pinmux_tpd12s015_pins { 263 tpd12s015_pins: pinmux_tpd12s015_pins {
264 pinctrl-single,pins = < 264 pinctrl-single,pins = <
265 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */ 265 0x22 (PIN_OUTPUT | MUX_MODE3) /* gpmc_a17.gpio_41 */
266 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */ 266 0x48 (PIN_OUTPUT | MUX_MODE3) /* gpmc_nbe1.gpio_60 */
267 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ 267 0x58 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* hdmi_hpd.gpio_63 */
268 >; 268 >;
269 }; 269 };
270 270
271 i2c1_pins: pinmux_i2c1_pins { 271 i2c1_pins: pinmux_i2c1_pins {
272 pinctrl-single,pins = < 272 pinctrl-single,pins = <
273 0xe2 0x118 /* i2c1_scl PULLUP | INPUTENABLE | MODE0 */ 273 0xe2 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */
274 0xe4 0x118 /* i2c1_sda PULLUP | INPUTENABLE | MODE0 */ 274 0xe4 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */
275 >; 275 >;
276 }; 276 };
277 277
278 i2c2_pins: pinmux_i2c2_pins { 278 i2c2_pins: pinmux_i2c2_pins {
279 pinctrl-single,pins = < 279 pinctrl-single,pins = <
280 0xe6 0x118 /* i2c2_scl PULLUP | INPUTENABLE | MODE0 */ 280 0xe6 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_scl */
281 0xe8 0x118 /* i2c2_sda PULLUP | INPUTENABLE | MODE0 */ 281 0xe8 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_sda */
282 >; 282 >;
283 }; 283 };
284 284
285 i2c3_pins: pinmux_i2c3_pins { 285 i2c3_pins: pinmux_i2c3_pins {
286 pinctrl-single,pins = < 286 pinctrl-single,pins = <
287 0xea 0x118 /* i2c3_scl PULLUP | INPUTENABLE | MODE0 */ 287 0xea (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */
288 0xec 0x118 /* i2c3_sda PULLUP | INPUTENABLE | MODE0 */ 288 0xec (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */
289 >; 289 >;
290 }; 290 };
291 291
292 i2c4_pins: pinmux_i2c4_pins { 292 i2c4_pins: pinmux_i2c4_pins {
293 pinctrl-single,pins = < 293 pinctrl-single,pins = <
294 0xee 0x118 /* i2c4_scl PULLUP | INPUTENABLE | MODE0 */ 294 0xee (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_scl */
295 0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */ 295 0xf0 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */
296 >; 296 >;
297 }; 297 };
298}; 298};
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 6137aff7dd3b..463b97de9ec5 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -8,6 +8,7 @@
8 8
9#include <dt-bindings/gpio/gpio.h> 9#include <dt-bindings/gpio/gpio.h>
10#include <dt-bindings/interrupt-controller/arm-gic.h> 10#include <dt-bindings/interrupt-controller/arm-gic.h>
11#include <dt-bindings/pinctrl/omap.h>
11 12
12#include "skeleton.dtsi" 13#include "skeleton.dtsi"
13 14
diff --git a/arch/arm/boot/dts/omap5-evm.dts b/arch/arm/boot/dts/omap5-evm.dts
index f5f55d1d88fa..22e9ee8daedb 100644
--- a/arch/arm/boot/dts/omap5-evm.dts
+++ b/arch/arm/boot/dts/omap5-evm.dts
@@ -40,106 +40,106 @@
40 40
41 twl6040_pins: pinmux_twl6040_pins { 41 twl6040_pins: pinmux_twl6040_pins {
42 pinctrl-single,pins = < 42 pinctrl-single,pins = <
43 0x18a 0x6 /* perslimbus2_clock.gpio5_145 OUTPUT | MODE6 */ 43 0x18a (PIN_OUTPUT | MUX_MODE6) /* perslimbus2_clock.gpio5_145 */
44 >; 44 >;
45 }; 45 };
46 46
47 mcpdm_pins: pinmux_mcpdm_pins { 47 mcpdm_pins: pinmux_mcpdm_pins {
48 pinctrl-single,pins = < 48 pinctrl-single,pins = <
49 0x142 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */ 49 0x142 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_clks.abe_clks */
50 0x15c 0x108 /* abemcpdm_ul_data.abemcpdm_ul_data INPUT PULLDOWN | MODE0 */ 50 0x15c (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_ul_data.abemcpdm_ul_data */
51 0x15e 0x108 /* abemcpdm_dl_data.abemcpdm_dl_data INPUT PULLDOWN | MODE0 */ 51 0x15e (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_dl_data.abemcpdm_dl_data */
52 0x160 0x118 /* abemcpdm_frame.abemcpdm_frame INPUT PULLUP | MODE0 */ 52 0x160 (PIN_INPUT_PULLUP | MUX_MODE0) /* abemcpdm_frame.abemcpdm_frame */
53 0x162 0x108 /* abemcpdm_lb_clk.abemcpdm_lb_clk INPUT PULLDOWN | MODE0 */ 53 0x162 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_lb_clk.abemcpdm_lb_clk */
54 >; 54 >;
55 }; 55 };
56 56
57 dmic_pins: pinmux_dmic_pins { 57 dmic_pins: pinmux_dmic_pins {
58 pinctrl-single,pins = < 58 pinctrl-single,pins = <
59 0x144 0x100 /* abedmic_din1.abedmic_din1 INPUT | MODE0 */ 59 0x144 (PIN_INPUT | MUX_MODE0) /* abedmic_din1.abedmic_din1 */
60 0x146 0x100 /* abedmic_din2.abedmic_din2 INPUT | MODE0 */ 60 0x146 (PIN_INPUT | MUX_MODE0) /* abedmic_din2.abedmic_din2 */
61 0x148 0x100 /* abedmic_din3.abedmic_din3 INPUT | MODE0 */ 61 0x148 (PIN_INPUT | MUX_MODE0) /* abedmic_din3.abedmic_din3 */
62 0x14a 0 /* abedmic_clk1.abedmic_clk1 OUTPUT | MODE0 */ 62 0x14a (PIN_OUTPUT | MUX_MODE0) /* abedmic_clk1.abedmic_clk1 */
63 >; 63 >;
64 }; 64 };
65 65
66 mcbsp1_pins: pinmux_mcbsp1_pins { 66 mcbsp1_pins: pinmux_mcbsp1_pins {
67 pinctrl-single,pins = < 67 pinctrl-single,pins = <
68 0x14c 0x101 /* abedmic_clk2.abemcbsp1_fsx INPUT | MODE1 */ 68 0x14c (PIN_INPUT | MUX_MODE1) /* abedmic_clk2.abemcbsp1_fsx */
69 0x14e 0x9 /* abedmic_clk3.abemcbsp1_dx OUTPUT PULLDOWN | MODE1 */ 69 0x14e (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* abedmic_clk3.abemcbsp1_dx */
70 0x150 0x101 /* abeslimbus1_clock.abemcbsp1_clkx INPUT | MODE0 */ 70 0x150 (PIN_INPUT | MUX_MODE1) /* abeslimbus1_clock.abemcbsp1_clkx */
71 0x152 0x109 /* abeslimbus1_data.abemcbsp1_dr INPUT PULLDOWN | MODE1 */ 71 0x152 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* abeslimbus1_data.abemcbsp1_dr */
72 >; 72 >;
73 }; 73 };
74 74
75 mcbsp2_pins: pinmux_mcbsp2_pins { 75 mcbsp2_pins: pinmux_mcbsp2_pins {
76 pinctrl-single,pins = < 76 pinctrl-single,pins = <
77 0x154 0x108 /* abemcbsp2_dr.abemcbsp2_dr INPUT PULLDOWN | MODE0 */ 77 0x154 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dr.abemcbsp2_dr */
78 0x156 0x8 /* abemcbsp2_dx.abemcbsp2_dx OUTPUT PULLDOWN | MODE0 */ 78 0x156 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dx.abemcbsp2_dx */
79 0x158 0x100 /* abemcbsp2_fsx.abemcbsp2_fsx INPUT | MODE0 */ 79 0x158 (PIN_INPUT | MUX_MODE0) /* abemcbsp2_fsx.abemcbsp2_fsx */
80 0x15a 0x100 /* abemcbsp2_clkx.abemcbsp2_clkx INPUT | MODE0 */ 80 0x15a (PIN_INPUT | MUX_MODE0) /* abemcbsp2_clkx.abemcbsp2_clkx */
81 >; 81 >;
82 }; 82 };
83 83
84 i2c1_pins: pinmux_i2c1_pins { 84 i2c1_pins: pinmux_i2c1_pins {
85 pinctrl-single,pins = < 85 pinctrl-single,pins = <
86 0x1b2 0x118 /* i2c1_scl PULLUP | INPUTENABLE | MODE0 */ 86 0x1b2 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */
87 0x1b4 0x118 /* i2c1_sda PULLUP | INPUTENABLE | MODE0 */ 87 0x1b4 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */
88 >; 88 >;
89 }; 89 };
90 90
91 i2c2_pins: pinmux_i2c2_pins { 91 i2c2_pins: pinmux_i2c2_pins {
92 pinctrl-single,pins = < 92 pinctrl-single,pins = <
93 0x178 0x100 /* i2c2_scl INPUTENABLE | MODE0 */ 93 0x178 (PIN_INPUT | MUX_MODE0) /* i2c2_scl */
94 0x17a 0x100 /* i2c2_sda INPUTENABLE | MODE0 */ 94 0x17a (PIN_INPUT | MUX_MODE0) /* i2c2_sda */
95 >; 95 >;
96 }; 96 };
97 97
98 i2c3_pins: pinmux_i2c3_pins { 98 i2c3_pins: pinmux_i2c3_pins {
99 pinctrl-single,pins = < 99 pinctrl-single,pins = <
100 0x13a 0x100 /* i2c3_scl INPUTENABLE | MODE0 */ 100 0x13a (PIN_INPUT | MUX_MODE0) /* i2c3_scl */
101 0x13c 0x100 /* i2c3_sda INPUTENABLE | MODE0 */ 101 0x13c (PIN_INPUT | MUX_MODE0) /* i2c3_sda */
102 >; 102 >;
103 }; 103 };
104 104
105 i2c4_pins: pinmux_i2c4_pins { 105 i2c4_pins: pinmux_i2c4_pins {
106 pinctrl-single,pins = < 106 pinctrl-single,pins = <
107 0xb8 0x100 /* i2c4_scl INPUTENABLE | MODE0 */ 107 0xb8 (PIN_INPUT | MUX_MODE0) /* i2c4_scl */
108 0xba 0x100 /* i2c4_sda INPUTENABLE | MODE0 */ 108 0xba (PIN_INPUT | MUX_MODE0) /* i2c4_sda */
109 >; 109 >;
110 }; 110 };
111 111
112 i2c5_pins: pinmux_i2c5_pins { 112 i2c5_pins: pinmux_i2c5_pins {
113 pinctrl-single,pins = < 113 pinctrl-single,pins = <
114 0x184 0x100 /* i2c5_scl INPUTENABLE | MODE0 */ 114 0x184 (PIN_INPUT | MUX_MODE0) /* i2c5_scl */
115 0x186 0x100 /* i2c5_sda INPUTENABLE | MODE0 */ 115 0x186 (PIN_INPUT | MUX_MODE0) /* i2c5_sda */
116 >; 116 >;
117 }; 117 };
118 118
119 mcspi2_pins: pinmux_mcspi2_pins { 119 mcspi2_pins: pinmux_mcspi2_pins {
120 pinctrl-single,pins = < 120 pinctrl-single,pins = <
121 0xbc 0x100 /* MCSPI2_CLK INPUTENABLE | MODE0 */ 121 0xbc (PIN_INPUT | MUX_MODE0) /* mcspi2_clk */
122 0xbe 0x100 /* MCSPI2_SIMO INPUTENABLE | MODE0 */ 122 0xbe (PIN_INPUT | MUX_MODE0) /* mcspi2_simo */
123 0xc0 0x118 /* MCSPI2_SOMI PULLUP | INPUTENABLE | MODE0*/ 123 0xc0 (PIN_INPUT_PULLUP | MUX_MODE0) /* mcspi2_somi */
124 0xc2 0x0 /* MCSPI2_CS MODE0*/ 124 0xc2 (PIN_OUTPUT | MUX_MODE0) /* mcspi2_cs */
125 >; 125 >;
126 }; 126 };
127 127
128 mcspi3_pins: pinmux_mcspi3_pins { 128 mcspi3_pins: pinmux_mcspi3_pins {
129 pinctrl-single,pins = < 129 pinctrl-single,pins = <
130 0x78 0x101 /* MCSPI2_SOMI INPUTENABLE | MODE1 */ 130 0x78 (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */
131 0x7a 0x101 /* MCSPI2_CS INPUTENABLE | MODE1 */ 131 0x7a (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */
132 0x7c 0x101 /* MCSPI2_SIMO INPUTENABLE | MODE1 */ 132 0x7c (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */
133 0x7e 0x101 /* MCSPI2_CLK INPUTENABLE | MODE1 */ 133 0x7e (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */
134 >; 134 >;
135 }; 135 };
136 136
137 mcspi4_pins: pinmux_mcspi4_pins { 137 mcspi4_pins: pinmux_mcspi4_pins {
138 pinctrl-single,pins = < 138 pinctrl-single,pins = <
139 0x164 0x101 /* MCSPI2_CLK INPUTENABLE | MODE1 */ 139 0x164 (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */
140 0x168 0x101 /* MCSPI2_SIMO INPUTENABLE | MODE1 */ 140 0x168 (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */
141 0x16a 0x101 /* MCSPI2_SOMI INPUTENABLE | MODE1 */ 141 0x16a (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */
142 0x16c 0x101 /* MCSPI2_CS INPUTENABLE | MODE1 */ 142 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */
143 >; 143 >;
144 }; 144 };
145}; 145};
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index c2f59dea4e55..1e84db866af6 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -9,6 +9,7 @@
9 9
10#include <dt-bindings/gpio/gpio.h> 10#include <dt-bindings/gpio/gpio.h>
11#include <dt-bindings/interrupt-controller/arm-gic.h> 11#include <dt-bindings/interrupt-controller/arm-gic.h>
12#include <dt-bindings/pinctrl/omap.h>
12 13
13#include "skeleton.dtsi" 14#include "skeleton.dtsi"
14 15
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-16 10:22:32 -0400