Skip to content

Commit 61fcbbf

Browse files
Rafał Miłeckilinusw
authored andcommitted
dt-bindings: pinctrl: mediatek: mt7622: fix array properties
Some properties (function groups & pins) are meant to be arrays and should allow multiple entries out of enum sets. Use "items" for those. Mistake was noticed during validation of in-kernel DTS files. Fixes: b9ffc18 ("dt-bindings: mediatek: convert pinctrl to yaml") Signed-off-by: Rafał Miłecki <[email protected]> Acked-by: Rob Herring <[email protected]> Message-ID: <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
1 parent dbe0ed3 commit 61fcbbf

File tree

1 file changed

+49
-43
lines changed

1 file changed

+49
-43
lines changed

Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml

Lines changed: 49 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,18 @@ patternProperties:
100100
then:
101101
properties:
102102
groups:
103-
enum: [emmc, emmc_rst]
103+
items:
104+
enum: [emmc, emmc_rst]
104105
- if:
105106
properties:
106107
function:
107108
const: eth
108109
then:
109110
properties:
110111
groups:
111-
enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw,
112-
rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio]
112+
items:
113+
enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw,
114+
rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio]
113115
- if:
114116
properties:
115117
function:
@@ -126,10 +128,11 @@ patternProperties:
126128
then:
127129
properties:
128130
groups:
129-
enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data,
130-
i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws,
131-
i2s1_out_data, i2s2_out_data, i2s3_out_data,
132-
i2s4_out_data]
131+
items:
132+
enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data,
133+
i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws,
134+
i2s1_out_data, i2s2_out_data, i2s3_out_data,
135+
i2s4_out_data]
133136
- if:
134137
properties:
135138
function:
@@ -162,10 +165,11 @@ patternProperties:
162165
then:
163166
properties:
164167
groups:
165-
enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken,
166-
pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq,
167-
pcie0_pad_perst, pcie1_pad_perst, pcie_pereset,
168-
pcie_wake, pcie_clkreq]
168+
items:
169+
enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken,
170+
pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq,
171+
pcie0_pad_perst, pcie1_pad_perst, pcie_pereset,
172+
pcie_wake, pcie_clkreq]
169173
- if:
170174
properties:
171175
function:
@@ -181,11 +185,12 @@ patternProperties:
181185
then:
182186
properties:
183187
groups:
184-
enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1,
185-
pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0,
186-
pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1,
187-
pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3,
188-
pwm_ch7_0, pwm_0, pwm_1]
188+
items:
189+
enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1,
190+
pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0,
191+
pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1,
192+
pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3,
193+
pwm_ch7_0, pwm_0, pwm_1]
189194
- if:
190195
properties:
191196
function:
@@ -263,33 +268,34 @@ patternProperties:
263268
pins:
264269
description:
265270
An array of strings. Each string contains the name of a pin.
266-
enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0,
267-
RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS,
268-
I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT,
269-
I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1,
270-
G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2,
271-
G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6,
272-
NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0,
273-
MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1,
274-
MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2,
275-
MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3,
276-
MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL,
277-
PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS,
278-
GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N,
279-
PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2,
280-
AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4,
281-
PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA,
282-
WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4,
283-
WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG,
284-
EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS,
285-
EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N,
286-
WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD,
287-
UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD,
288-
UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N,
289-
PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5,
290-
GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK,
291-
TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3,
292-
WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6]
271+
items:
272+
enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0,
273+
RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS,
274+
I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT,
275+
I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1,
276+
G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2,
277+
G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6,
278+
NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0,
279+
MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1,
280+
MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2,
281+
MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3,
282+
MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL,
283+
PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS,
284+
GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N,
285+
PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2,
286+
AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4,
287+
PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA,
288+
WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4,
289+
WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG,
290+
EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS,
291+
EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N,
292+
WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD,
293+
UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD,
294+
UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N,
295+
PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5,
296+
GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK,
297+
TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3,
298+
WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6]
293299

294300
bias-disable: true
295301

0 commit comments

Comments
 (0)