According to the mediatek,mt8173-pinctrl device tree binding schema, the
pinctrl node names should match pattern 'pins$'. Fix this.
Signed-off-by: Ariel D'Alessandro <ariel.dalessan...@collabora.com>
---
.../boot/dts/mediatek/mt8173-elm-hana.dtsi | 2 +-
arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 26 +++++++++----------
arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 14 +++++-----
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 14 +++++-----
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi
b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi
index dfc5c2f0ddefd..7d665cedf8a44 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi
@@ -80,7 +80,7 @@ pins2 {
};
};
- mmc1_pins_default: mmc1default {
+ mmc1_pins_default: mmc1_default_pins {
pins_wp {
pinmux = <MT8173_PIN_42_DSI_TE__FUNC_GPIO42>;
input-enable;
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
index 0d995b342d463..0766026864c9d 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
@@ -601,7 +601,7 @@ &pio {
"SOC_I2C4_1V8_SDA_400K",
"SOC_I2C4_1V8_SCL_400K";
- aud_i2s2: aud_i2s2 {
+ aud_i2s2: aud_i2s2_pins {
pins1 {
pinmux = <MT8173_PIN_128_I2S0_LRCK__FUNC_I2S1_WS>,
<MT8173_PIN_129_I2S0_BCK__FUNC_I2S1_BCK>,
@@ -654,14 +654,14 @@ pins1 {
};
};
- i2c1_pins_a: i2c1 {
+ i2c1_pins_a: i2c1_pins {
da9211_pins {
pinmux = <MT8173_PIN_15_EINT15__FUNC_GPIO15>;
bias-pull-up;
};
};
- mmc0_pins_default: mmc0default {
+ mmc0_pins_default: mmc0_default_pins {
pins_cmd_dat {
pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>,
<MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>,
@@ -686,7 +686,7 @@ pins_rst {
};
};
- mmc1_pins_default: mmc1default {
+ mmc1_pins_default: mmc1_default_pins {
pins_cmd_dat {
pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>,
<MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>,
@@ -710,7 +710,7 @@ pins_insert {
};
};
- mmc3_pins_default: mmc3default {
+ mmc3_pins_default: mmc3_default_pins {
pins_dat {
pinmux = <MT8173_PIN_22_MSDC3_DAT0__FUNC_MSDC3_DAT0>,
<MT8173_PIN_23_MSDC3_DAT1__FUNC_MSDC3_DAT1>,
@@ -735,7 +735,7 @@ pins_clk {
};
};
- mmc0_pins_uhs: mmc0 {
+ mmc0_pins_uhs: mmc0_uhs_pins {
pins_cmd_dat {
pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>,
<MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>,
@@ -769,7 +769,7 @@ pins_rst {
};
};
- mmc1_pins_uhs: mmc1 {
+ mmc1_pins_uhs: mmc1_uhs_pins {
pins_cmd_dat {
pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>,
<MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>,
@@ -788,7 +788,7 @@ pins_clk {
};
};
- mmc3_pins_uhs: mmc3 {
+ mmc3_pins_uhs: mmc3_uhs_pins {
pins_dat {
pinmux = <MT8173_PIN_22_MSDC3_DAT0__FUNC_MSDC3_DAT0>,
<MT8173_PIN_23_MSDC3_DAT1__FUNC_MSDC3_DAT1>,
@@ -813,7 +813,7 @@ pins_clk {
};
};
- nor_gpio1_pins: nor {
+ nor_gpio1_pins: nor_pins {
pins1 {
pinmux = <MT8173_PIN_6_EINT6__FUNC_SFCS0>,
<MT8173_PIN_7_EINT7__FUNC_SFHOLD>,
@@ -863,7 +863,7 @@ pins1 {
};
};
- rt5650_irq: rt5650_irq {
+ rt5650_irq: rt5650_irq_pins {
pins1 {
pinmux = <MT8173_PIN_3_EINT3__FUNC_GPIO3>;
bias-pull-down;
@@ -877,7 +877,7 @@ pins1 {
};
};
- spi_pins_a: spi1 {
+ spi_pins_a: spi1_pins {
pins1 {
pinmux = <MT8173_PIN_0_EINT0__FUNC_GPIO0>;
bias-pull-up;
@@ -892,7 +892,7 @@ pins_spi {
};
};
- trackpad_irq: trackpad_irq {
+ trackpad_irq: trackpad_irq_pins {
pins1 {
pinmux = <MT8173_PIN_117_URXD3__FUNC_GPIO117>;
input-enable;
@@ -900,7 +900,7 @@ pins1 {
};
};
- usb_pins: usb {
+ usb_pins: usb_pins {
pins1 {
pinmux = <MT8173_PIN_101_MSDC2_DAT1__FUNC_GPIO101>;
output-high;
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
index 9fffed0ef4bff..f28110c331c71 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
@@ -179,7 +179,7 @@ pins1 {
};
};
- mmc0_pins_default: mmc0default {
+ mmc0_pins_default: mmc0_default_pins {
pins_cmd_dat {
pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>,
<MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>,
@@ -205,7 +205,7 @@ pins_rst {
};
};
- mmc1_pins_default: mmc1default {
+ mmc1_pins_default: mmc1_default_pins {
pins_cmd_dat {
pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>,
<MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>,
@@ -229,7 +229,7 @@ pins_insert {
};
};
- mmc0_pins_uhs: mmc0 {
+ mmc0_pins_uhs: mmc0_uhs_pins {
pins_cmd_dat {
pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>,
<MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>,
@@ -257,7 +257,7 @@ pins_rst {
};
};
- mmc1_pins_uhs: mmc1 {
+ mmc1_pins_uhs: mmc1_uhs_pins {
pins_cmd_dat {
pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>,
<MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>,
@@ -276,14 +276,14 @@ pins_clk {
};
};
- usb_id_pins_float: usb_iddig_pull_up {
+ usb_id_pins_float: usb_iddig_pull_up_pins {
pins_iddig {
pinmux = <MT8173_PIN_16_IDDIG__FUNC_IDDIG>;
bias-pull-up;
};
};
- usb_id_pins_ground: usb_iddig_pull_down {
+ usb_id_pins_ground: usb_iddig_pull_down_pins {
pins_iddig {
pinmux = <MT8173_PIN_16_IDDIG__FUNC_IDDIG>;
bias-pull-down;
@@ -474,7 +474,7 @@ mt6397_vibr_reg: ldo_vibr {
};
&pio {
- spi_pins_a: spi0 {
+ spi_pins_a: spi0_pins {
pins_spi {
pinmux = <MT8173_PIN_69_SPI_CK__FUNC_SPI_CK_0_>,
<MT8173_PIN_70_SPI_MI__FUNC_SPI_MI_0_>,
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 122a57c3780b6..7e522bb8963a0 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -391,7 +391,7 @@ pio: pinctrl@1000b000 {
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
- hdmi_pin: xxx {
+ hdmi_pin: hdmi_pins {
/*hdmi htplg pin*/
pins1 {
@@ -401,7 +401,7 @@ pins1 {
};
};
- i2c0_pins_a: i2c0 {
+ i2c0_pins_a: i2c0_pins {
pins1 {
pinmux =
<MT8173_PIN_45_SDA0__FUNC_SDA0>,
<MT8173_PIN_46_SCL0__FUNC_SCL0>;
@@ -409,7 +409,7 @@ pins1 {
};
};
- i2c1_pins_a: i2c1 {
+ i2c1_pins_a: i2c1_pins {
pins1 {
pinmux =
<MT8173_PIN_125_SDA1__FUNC_SDA1>,
<MT8173_PIN_126_SCL1__FUNC_SCL1>;
@@ -417,7 +417,7 @@ pins1 {
};
};
- i2c2_pins_a: i2c2 {
+ i2c2_pins_a: i2c2_pins {
pins1 {
pinmux =
<MT8173_PIN_43_SDA2__FUNC_SDA2>,
<MT8173_PIN_44_SCL2__FUNC_SCL2>;
@@ -425,7 +425,7 @@ pins1 {
};
};
- i2c3_pins_a: i2c3 {
+ i2c3_pins_a: i2c3_pins {
pins1 {
pinmux =
<MT8173_PIN_106_SDA3__FUNC_SDA3>,
<MT8173_PIN_107_SCL3__FUNC_SCL3>;
@@ -433,7 +433,7 @@ pins1 {
};
};
- i2c4_pins_a: i2c4 {
+ i2c4_pins_a: i2c4_pins {
pins1 {
pinmux =
<MT8173_PIN_133_SDA4__FUNC_SDA4>,
<MT8173_PIN_134_SCL4__FUNC_SCL4>;
@@ -441,7 +441,7 @@ pins1 {
};
};
- i2c6_pins_a: i2c6 {
+ i2c6_pins_a: i2c6_pins {
pins1 {
pinmux =
<MT8173_PIN_100_MSDC2_DAT0__FUNC_SDA5>,
<MT8173_PIN_101_MSDC2_DAT1__FUNC_SCL5>;
--
2.50.1
