| From 89c8efdc1325435af3cca3cabe20b15e73a42a5e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 23 Apr 2024 06:55:01 +0200 |
| Subject: dt-bindings: pinctrl: mediatek: mt7622: fix array properties |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Rafał Miłecki <rafal@milecki.pl> |
| |
| [ Upstream commit 61fcbbf3ca038c048c942ce31bb3d3c846c87581 ] |
| |
| 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: b9ffc18c6388 ("dt-bindings: mediatek: convert pinctrl to yaml") |
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> |
| Acked-by: Rob Herring <robh@kernel.org> |
| Message-ID: <20240423045502.7778-1-zajec5@gmail.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| .../pinctrl/mediatek,mt7622-pinctrl.yaml | 92 ++++++++++--------- |
| 1 file changed, 49 insertions(+), 43 deletions(-) |
| |
| diff --git a/Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml |
| index bd72a326e6e06..60f30a59f3853 100644 |
| --- a/Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml |
| +++ b/Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml |
| @@ -97,7 +97,8 @@ patternProperties: |
| then: |
| properties: |
| groups: |
| - enum: [emmc, emmc_rst] |
| + items: |
| + enum: [emmc, emmc_rst] |
| - if: |
| properties: |
| function: |
| @@ -105,8 +106,9 @@ patternProperties: |
| then: |
| properties: |
| groups: |
| - enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw, |
| - rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio] |
| + items: |
| + enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw, |
| + rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio] |
| - if: |
| properties: |
| function: |
| @@ -123,10 +125,11 @@ patternProperties: |
| then: |
| properties: |
| groups: |
| - enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data, |
| - i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws, |
| - i2s1_out_data, i2s2_out_data, i2s3_out_data, |
| - i2s4_out_data] |
| + items: |
| + enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data, |
| + i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws, |
| + i2s1_out_data, i2s2_out_data, i2s3_out_data, |
| + i2s4_out_data] |
| - if: |
| properties: |
| function: |
| @@ -159,10 +162,11 @@ patternProperties: |
| then: |
| properties: |
| groups: |
| - enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken, |
| - pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq, |
| - pcie0_pad_perst, pcie1_pad_perst, pcie_pereset, |
| - pcie_wake, pcie_clkreq] |
| + items: |
| + enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken, |
| + pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq, |
| + pcie0_pad_perst, pcie1_pad_perst, pcie_pereset, |
| + pcie_wake, pcie_clkreq] |
| - if: |
| properties: |
| function: |
| @@ -178,11 +182,12 @@ patternProperties: |
| then: |
| properties: |
| groups: |
| - enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1, |
| - pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0, |
| - pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1, |
| - pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3, |
| - pwm_ch7_0, pwm_0, pwm_1] |
| + items: |
| + enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1, |
| + pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0, |
| + pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1, |
| + pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3, |
| + pwm_ch7_0, pwm_0, pwm_1] |
| - if: |
| properties: |
| function: |
| @@ -260,33 +265,34 @@ patternProperties: |
| pins: |
| description: |
| An array of strings. Each string contains the name of a pin. |
| - enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0, |
| - RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS, |
| - I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT, |
| - I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1, |
| - G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2, |
| - G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6, |
| - NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0, |
| - MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1, |
| - MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2, |
| - MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3, |
| - MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL, |
| - PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS, |
| - GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N, |
| - PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2, |
| - AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4, |
| - PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA, |
| - WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4, |
| - WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG, |
| - EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS, |
| - EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N, |
| - WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD, |
| - UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD, |
| - UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N, |
| - PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5, |
| - GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK, |
| - TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3, |
| - WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6] |
| + items: |
| + enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0, |
| + RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS, |
| + I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT, |
| + I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1, |
| + G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2, |
| + G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6, |
| + NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0, |
| + MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1, |
| + MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2, |
| + MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3, |
| + MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL, |
| + PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS, |
| + GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N, |
| + PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2, |
| + AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4, |
| + PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA, |
| + WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4, |
| + WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG, |
| + EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS, |
| + EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N, |
| + WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD, |
| + UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD, |
| + UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N, |
| + PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5, |
| + GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK, |
| + TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3, |
| + WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6] |
| |
| bias-disable: true |
| |
| -- |
| 2.43.0 |
| |
