Skip to content

Commit 01aa6cb

Browse files
committed
dt-bindings: pinctrl: ralink: Fix 'enum' lists with duplicate entries
There's no reason to list the same value twice in an 'enum'. This was fixed treewide in commit c3b0068 ("dt-bindings: Fix 'enum' lists with duplicate entries"), but this one got added in the merge window. A meta-schema change will catch future cases. Signed-off-by: Rob Herring <[email protected]> Acked-by: Sergio Paracuellos <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 927c63e commit 01aa6cb

File tree

2 files changed

+28
-25
lines changed

2 files changed

+28
-25
lines changed

Documentation/devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,37 @@ patternProperties:
3232
groups:
3333
description: The pin group to select.
3434
enum: [
35+
# common
36+
i2c, spi, wdt,
37+
3538
# For MT7620 SoC
36-
ephy, i2c, mdio, nd_sd, pa, pcie, rgmii1, rgmii2, spi, spi refclk,
37-
uartf, uartlite, wdt, wled,
39+
ephy, mdio, nd_sd, pa, pcie, rgmii1, rgmii2, spi refclk,
40+
uartf, uartlite, wled,
3841

3942
# For MT7628 and MT7688 SoCs
40-
gpio, i2c, i2s, p0led_an, p0led_kn, p1led_an, p1led_kn, p2led_an,
43+
gpio, i2s, p0led_an, p0led_kn, p1led_an, p1led_kn, p2led_an,
4144
p2led_kn, p3led_an, p3led_kn, p4led_an, p4led_kn, perst, pwm0,
42-
pwm1, refclk, sdmode, spi, spi cs1, spis, uart0, uart1, uart2,
43-
wdt, wled_an, wled_kn,
45+
pwm1, refclk, sdmode, spi cs1, spis, uart0, uart1, uart2,
46+
wled_an, wled_kn,
4447
]
4548

4649
function:
4750
description: The mux function to select.
4851
enum: [
52+
# common
53+
gpio, i2c, refclk, spi,
54+
4955
# For MT7620 SoC
50-
ephy, gpio, gpio i2s, gpio uartf, i2c, i2s uartf, mdio, nand, pa,
51-
pcie refclk, pcie rst, pcm gpio, pcm i2s, pcm uartf, refclk,
52-
rgmii1, rgmii2, sd, spi, spi refclk, uartf, uartlite, wdt refclk,
56+
ephy, gpio i2s, gpio uartf, i2s uartf, mdio, nand, pa,
57+
pcie refclk, pcie rst, pcm gpio, pcm i2s, pcm uartf,
58+
rgmii1, rgmii2, sd, spi refclk, uartf, uartlite, wdt refclk,
5359
wdt rst, wled,
5460

5561
# For MT7628 and MT7688 SoCs
56-
antenna, debug, gpio, i2c, i2s, jtag, p0led_an, p0led_kn,
62+
antenna, debug, i2s, jtag, p0led_an, p0led_kn,
5763
p1led_an, p1led_kn, p2led_an, p2led_kn, p3led_an, p3led_kn,
5864
p4led_an, p4led_kn, pcie, pcm, perst, pwm, pwm0, pwm1, pwm_uart2,
59-
refclk, rsvd, sdxc, sdxc d5 d4, sdxc d6, sdxc d7, spi, spi cs1,
65+
rsvd, sdxc, sdxc d5 d4, sdxc d6, sdxc d7, spi cs1,
6066
spis, sw_r, uart0, uart1, uart2, utif, wdt, wled_an, wled_kn, -,
6167
]
6268

Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,29 @@ patternProperties:
3333
groups:
3434
description: The pin group to select.
3535
enum: [
36+
# common
37+
i2c, jtag, led, mdio, rgmii, spi, spi_cs1, uartf, uartlite,
38+
3639
# For RT3050, RT3052 and RT3350 SoCs
37-
i2c, jtag, mdio, rgmii, sdram, spi, uartf, uartlite,
40+
sdram,
3841

3942
# For RT3352 SoC
40-
i2c, jtag, led, lna, mdio, pa, rgmii, spi, spi_cs1, uartf,
41-
uartlite,
42-
43-
# For RT5350 SoC
44-
i2c, jtag, led, spi, spi_cs1, uartf, uartlite,
43+
lna, pa
4544
]
4645

4746
function:
4847
description: The mux function to select.
4948
enum: [
49+
# common
50+
gpio, gpio i2s, gpio uartf, i2c, i2s uartf, jtag, led, mdio,
51+
pcm gpio, pcm i2s, pcm uartf, rgmii, spi, spi_cs1, uartf,
52+
uartlite, wdg_cs1,
53+
5054
# For RT3050, RT3052 and RT3350 SoCs
51-
gpio, gpio i2s, gpio uartf, i2c, i2s uartf, jtag, mdio, pcm gpio,
52-
pcm i2s, pcm uartf, rgmii, sdram, spi, uartf, uartlite,
55+
sdram,
5356

5457
# For RT3352 SoC
55-
gpio, gpio i2s, gpio uartf, i2c, i2s uartf, jtag, led, lna, mdio,
56-
pa, pcm gpio, pcm i2s, pcm uartf, rgmii, spi, spi_cs1, uartf,
57-
uartlite, wdg_cs1,
58-
59-
# For RT5350 SoC
60-
gpio, gpio i2s, gpio uartf, i2c, i2s uartf, jtag, led, pcm gpio,
61-
pcm i2s, pcm uartf, spi, spi_cs1, uartf, uartlite, wdg_cs1,
58+
lna, pa
6259
]
6360

6461
required:

0 commit comments

Comments
 (0)