Skip to content

Commit 98788f7

Browse files
tmlindnmenon
tmlind
authored and
nmenon
committed
ARM: dts: Unify pinctrl-single pin group nodes for keystone
We want to unify the pinctrl-single pin group nodes to use naming "pins". Otherwise non-standad pin group names will add make dtbs checks errors when the pinctrl-single yaml binding gets merged. Cc: Conor Dooley <conor+dt@kernel.org> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> Cc: Rob Herring <robh+dt@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com> Link: https://lore.kernel.org/r/20230523074845.59433-1-tony@atomide.com Signed-off-by: Nishanth Menon <nm@ti.com>
1 parent ac9a786 commit 98788f7

3 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎arch/arm/boot/dts/keystone-k2g-evm.dts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@
120120
};
121121

122122
&k2g_pinctrl {
123-
uart0_pins: pinmux_uart0_pins {
123+
uart0_pins: uart0-pins {
124124
pinctrl-single,pins = <
125125
K2G_CORE_IOPAD(0x11cc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* uart0_rxd.uart0_rxd */
126126
K2G_CORE_IOPAD(0x11d0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
127127
>;
128128
};
129129

130-
mmc0_pins: pinmux_mmc0_pins {
130+
mmc0_pins: mmc0-pins {
131131
pinctrl-single,pins = <
132132
K2G_CORE_IOPAD(0x1300) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat3.mmc0_dat3 */
133133
K2G_CORE_IOPAD(0x1304) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat2.mmc0_dat2 */
@@ -139,7 +139,7 @@
139139
>;
140140
};
141141

142-
mmc1_pins: pinmux_mmc1_pins {
142+
mmc1_pins: mmc1-pins {
143143
pinctrl-single,pins = <
144144
K2G_CORE_IOPAD(0x10ec) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat7.mmc1_dat7 */
145145
K2G_CORE_IOPAD(0x10f0) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat6.mmc1_dat6 */
@@ -154,27 +154,27 @@
154154
>;
155155
};
156156

157-
i2c0_pins: pinmux_i2c0_pins {
157+
i2c0_pins: i2c0-pins {
158158
pinctrl-single,pins = <
159159
K2G_CORE_IOPAD(0x137c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
160160
K2G_CORE_IOPAD(0x1380) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
161161
>;
162162
};
163163

164-
i2c1_pins: pinmux_i2c1_pins {
164+
i2c1_pins: i2c1-pins {
165165
pinctrl-single,pins = <
166166
K2G_CORE_IOPAD(0x1384) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_scl.i2c1_scl */
167167
K2G_CORE_IOPAD(0x1388) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_sda.i2c1_sda */
168168
>;
169169
};
170170

171-
ecap0_pins: ecap0_pins {
171+
ecap0_pins: ecap0-pins {
172172
pinctrl-single,pins = <
173173
K2G_CORE_IOPAD(0x1374) (BUFFER_CLASS_B | MUX_MODE4) /* pr1_mdio_data.ecap0_in_apwm0_out */
174174
>;
175175
};
176176

177-
spi1_pins: pinmux_spi1_pins {
177+
spi1_pins: spi1-pins {
178178
pinctrl-single,pins = <
179179
K2G_CORE_IOPAD(0x11a4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_scs0.spi1_scs0 */
180180
K2G_CORE_IOPAD(0x11ac) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_clk.spi1_clk */
@@ -183,7 +183,7 @@
183183
>;
184184
};
185185

186-
qspi_pins: pinmux_qspi_pins {
186+
qspi_pins: qspi-pins {
187187
pinctrl-single,pins = <
188188
K2G_CORE_IOPAD(0x1204) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_clk.qspi_clk */
189189
K2G_CORE_IOPAD(0x1208) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_rclk.qspi_rclk */
@@ -195,28 +195,28 @@
195195
>;
196196
};
197197

198-
uart2_pins: pinmux_uart2_pins {
198+
uart2_pins: uart2-pins {
199199
pinctrl-single,pins = <
200200
K2G_CORE_IOPAD(0x11ec) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* uart2_rxd.uart2_rxd */
201201
K2G_CORE_IOPAD(0x11f0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart2_txd.uart2_txd */
202202
>;
203203
};
204204

205-
dcan0_pins: pinmux_dcan0_pins {
205+
dcan0_pins: dcan0-pins {
206206
pinctrl-single,pins = <
207207
K2G_CORE_IOPAD(0x11fc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dcan0tx.dcan0tx */
208208
K2G_CORE_IOPAD(0x1200) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* dcan0rx.dcan0rx */
209209
>;
210210
};
211211

212-
dcan1_pins: pinmux_dcan1_pins {
212+
dcan1_pins: dcan1-pins {
213213
pinctrl-single,pins = <
214214
K2G_CORE_IOPAD(0x1224) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE1) /* qspicsn2.dcan1tx */
215215
K2G_CORE_IOPAD(0x1228) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE1) /* qspicsn3.dcan1rx */
216216
>;
217217
};
218218

219-
emac_pins: pinmux_emac_pins {
219+
emac_pins: emac-pins {
220220
pinctrl-single,pins = <
221221
K2G_CORE_IOPAD(0x113C) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD1.RGMII_RXD1 */
222222
K2G_CORE_IOPAD(0x1138) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD2.RGMII_RXD2 */
@@ -233,14 +233,14 @@
233233
>;
234234
};
235235

236-
mdio_pins: pinmux_mdio_pins {
236+
mdio_pins: mdio-pins {
237237
pinctrl-single,pins = <
238238
K2G_CORE_IOPAD(0x118C) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_CLK.MDIO_CLK */
239239
K2G_CORE_IOPAD(0x1188) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_DATA.MDIO_DATA */
240240
>;
241241
};
242242

243-
vout_pins: pinmux_vout_pins {
243+
vout_pins: vout-pins {
244244
pinctrl-single,pins = <
245245
K2G_CORE_IOPAD(0x1078) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata23.dssdata23 */
246246
K2G_CORE_IOPAD(0x107c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata22.dssdata22 */
@@ -274,7 +274,7 @@
274274
>;
275275
};
276276

277-
mcasp2_pins: pinmux_mcasp2_pins {
277+
mcasp2_pins: mcasp2-pins {
278278
pinctrl-single,pins = <
279279
K2G_CORE_IOPAD(0x1234) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo2.mcasp2_axr2 */
280280
K2G_CORE_IOPAD(0x1238) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo3.mcasp2_axr3 */

‎arch/arm/boot/dts/keystone-k2g-ice.dts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,14 @@
218218
};
219219

220220
&k2g_pinctrl {
221-
uart0_pins: pinmux_uart0_pins {
221+
uart0_pins: uart0-pins {
222222
pinctrl-single,pins = <
223223
K2G_CORE_IOPAD(0x11cc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* uart0_rxd.uart0_rxd */
224224
K2G_CORE_IOPAD(0x11d0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
225225
>;
226226
};
227227

228-
qspi_pins: pinmux_qspi_pins {
228+
qspi_pins: qspi-pins {
229229
pinctrl-single,pins = <
230230
K2G_CORE_IOPAD(0x1204) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_clk.qspi_clk */
231231
K2G_CORE_IOPAD(0x1208) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_rclk.qspi_rclk */
@@ -237,7 +237,7 @@
237237
>;
238238
};
239239

240-
mmc1_pins: pinmux_mmc1_pins {
240+
mmc1_pins: mmc1-pins {
241241
pinctrl-single,pins = <
242242
K2G_CORE_IOPAD(0x10FC) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat3.mmc1_dat3 */
243243
K2G_CORE_IOPAD(0x1100) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat2.mmc1_dat2 */
@@ -251,21 +251,21 @@
251251
>;
252252
};
253253

254-
i2c0_pins: pinmux_i2c0_pins {
254+
i2c0_pins: i2c0-pins {
255255
pinctrl-single,pins = <
256256
K2G_CORE_IOPAD(0x137c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
257257
K2G_CORE_IOPAD(0x1380) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
258258
>;
259259
};
260260

261-
i2c1_pins: pinmux_i2c1_pins {
261+
i2c1_pins: i2c1-pins {
262262
pinctrl-single,pins = <
263263
K2G_CORE_IOPAD(0x1384) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_scl.i2c1_scl */
264264
K2G_CORE_IOPAD(0x1388) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_sda.i2c1_sda */
265265
>;
266266
};
267267

268-
user_leds: pinmux_user_leds {
268+
user_leds: user-leds-pins {
269269
pinctrl-single,pins = <
270270
K2G_CORE_IOPAD(0x102c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* gpmc_ad11.gpio0_11 */
271271
K2G_CORE_IOPAD(0x1030) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* gpmc_ad12.gpio0_12 */
@@ -283,7 +283,7 @@
283283
>;
284284
};
285285

286-
emac_pins: pinmux_emac_pins {
286+
emac_pins: emac-pins {
287287
pinctrl-single,pins = <
288288
K2G_CORE_IOPAD(0x113C) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD1.RGMII_RXD1 */
289289
K2G_CORE_IOPAD(0x1138) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD2.RGMII_RXD2 */
@@ -300,7 +300,7 @@
300300
>;
301301
};
302302

303-
mdio_pins: pinmux_mdio_pins {
303+
mdio_pins: mdio-pins {
304304
pinctrl-single,pins = <
305305
K2G_CORE_IOPAD(0x118C) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_CLK.MDIO_CLK */
306306
K2G_CORE_IOPAD(0x1188) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_DATA.MDIO_DATA */

‎arch/arm/boot/dts/keystone-k2l.dtsi‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,42 +116,42 @@
116116
pinctrl-single,function-mask = <0x1>;
117117
status = "disabled";
118118

119-
uart3_emifa_pins: pinmux_uart3_emifa_pins {
119+
uart3_emifa_pins: uart3-emifa-pins {
120120
pinctrl-single,bits = <
121121
/* UART3_EMIFA_SEL */
122122
0x0 0x0 0xc0
123123
>;
124124
};
125125

126-
uart2_emifa_pins: pinmux_uart2_emifa_pins {
126+
uart2_emifa_pins: uart2-emifa-pins {
127127
pinctrl-single,bits = <
128128
/* UART2_EMIFA_SEL */
129129
0x0 0x0 0x30
130130
>;
131131
};
132132

133-
uart01_spi2_pins: pinmux_uart01_spi2_pins {
133+
uart01_spi2_pins: uart01-spi2-pins {
134134
pinctrl-single,bits = <
135135
/* UART01_SPI2_SEL */
136136
0x0 0x0 0x4
137137
>;
138138
};
139139

140-
dfesync_rp1_pins: pinmux_dfesync_rp1_pins{
140+
dfesync_rp1_pins: dfesync-rp1-pins{
141141
pinctrl-single,bits = <
142142
/* DFESYNC_RP1_SEL */
143143
0x0 0x0 0x2
144144
>;
145145
};
146146

147-
avsif_pins: pinmux_avsif_pins {
147+
avsif_pins: avsif-pins {
148148
pinctrl-single,bits = <
149149
/* AVSIF_SEL */
150150
0x0 0x0 0x1
151151
>;
152152
};
153153

154-
gpio_emu_pins: pinmux_gpio_emu_pins {
154+
gpio_emu_pins: gpio-emu-pins {
155155
pinctrl-single,bits = <
156156
/*
157157
* GPIO_EMU_SEL[31]: 0-GPIO31, 1-EMU33
@@ -174,7 +174,7 @@
174174
>;
175175
};
176176

177-
gpio_timio_pins: pinmux_gpio_timio_pins {
177+
gpio_timio_pins: gpio-timio-pins {
178178
pinctrl-single,bits = <
179179
/*
180180
* GPIO_TIMIO_SEL[15]: 0-GPIO15, 1-TIMO7
@@ -194,7 +194,7 @@
194194
>;
195195
};
196196

197-
gpio_spi2cs_pins: pinmux_gpio_spi2cs_pins {
197+
gpio_spi2cs_pins: gpio-spi2cs-pins {
198198
pinctrl-single,bits = <
199199
/*
200200
* GPIO_SPI2CS_SEL[3]: 0-GPIO3, 1-SPI2CS4
@@ -206,7 +206,7 @@
206206
>;
207207
};
208208

209-
gpio_dfeio_pins: pinmux_gpio_dfeio_pins {
209+
gpio_dfeio_pins: gpio-dfeio-pins {
210210
pinctrl-single,bits = <
211211
/*
212212
* GPIO_DFEIO_SEL[31]: 0-DFEIO17, 1-GPIO63
@@ -230,7 +230,7 @@
230230
>;
231231
};
232232

233-
gpio_emifa_pins: pinmux_gpio_emifa_pins {
233+
gpio_emifa_pins: gpio-emifa-pins {
234234
pinctrl-single,bits = <
235235
/*
236236
* GPIO_EMIFA_SEL[15]: 0-EMIFA17, 1-GPIO47

0 commit comments

Comments
 (0)