ARM: dts: qcom: ipq8064: adhere to pinctrl dtschema

Pass dtbs_check for qcom,ipq8064-pinctrl.yaml.
Also remove invalid "bias-none" property, which I have assumed to mean
"bias-disable".

Signed-off-by: Rayyan Ansari <rayyan.ansari@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240711110545.31641-6-rayyan.ansari@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-ap148.dts
index a654d3c22c4f557da2e0c0e2d4ea41a88fba0ce7..5a8bf1a6f5597b46df56200468bb18038e5f72fc 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-ap148.dts
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-ap148.dts
@@ -7,12 +7,11 @@
 
        soc {
                pinmux@800000 {
-                       buttons_pins: buttons_pins {
-                               mux {
-                                       pins = "gpio54", "gpio65";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
+                       buttons_pins: buttons-state {
+                               pins = "gpio54", "gpio65";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-pull-up;
                        };
                };
 

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts
index 12e806adcda803ef4f2b577524cced65f3827cba..f09da9460c86af9c288a6493e3d5e2544878c08f 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts
@@ -404,59 +404,49 @@
 };
 
 &qcom_pinmux {
-       buttons_pins: buttons_pins {
-               mux {
-                       pins = "gpio66";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
+       buttons_pins: buttons-state {
+               pins = "gpio66";
+               function = "gpio";
+               drive-strength = <16>;
+               bias-disable;
        };
 
-       leds_pins: leds_pins {
-               mux {
-                       pins = "gpio33";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
+       leds_pins: leds-state {
+               pins = "gpio33";
+               function = "gpio";
+               drive-strength = <16>;
+               bias-disable;
        };
 
-       mdio1_pins: mdio1_pins {
-               mux {
-                       pins = "gpio10", "gpio11";
-                       function = "gpio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
+       mdio1_pins: mdio1-state {
+               pins = "gpio10", "gpio11";
+               function = "gpio";
+               drive-strength = <8>;
+               bias-disable;
        };
 
-       sw0_reset_pin: sw0_reset_pin {
-               mux {
-                       pins = "gpio16";
-                       drive-strength = <16>;
-                       function = "gpio";
-                       bias-disable;
-                       input-disable;
-               };
+       sw0_reset_pin: sw0-reset-state {
+               pins = "gpio16";
+               drive-strength = <16>;
+               function = "gpio";
+               bias-disable;
+               input-disable;
        };
 
-       sw1_reset_pin: sw1_reset_pin {
-               mux {
-                       pins = "gpio17";
-                       drive-strength = <16>;
-                       function = "gpio";
-                       bias-disable;
-                       input-disable;
-               };
+       sw1_reset_pin: sw1-reset-state {
+               pins = "gpio17";
+               drive-strength = <16>;
+               function = "gpio";
+               bias-disable;
+               input-disable;
        };
 
-       usb1_pwr_en_pins: usb1_pwr_en_pins {
-               mux {
-                       pins = "gpio4";
-                       function = "gpio";
-                       drive-strength = <16>;
-                       bias-disable;
-                       output-high;
-               };
+       usb1_pwr_en_pins: usb1-pwr-en-state {
+               pins = "gpio4";
+               function = "gpio";
+               drive-strength = <16>;
+               bias-disable;
+               output-high;
        };
 };
 

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
index da0fd75f4711117690f37578f6af44c7820ad046..9adefc88c5b460a54473cb2007c211cac9b64521 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
@@ -399,70 +399,58 @@
                        #interrupt-cells = <2>;
                        interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
 
-                       pcie0_pins: pcie0_pinmux {
-                               mux {
-                                       pins = "gpio3";
-                                       function = "pcie1_rst";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
+                       pcie0_pins: pcie0-state {
+                               pins = "gpio3";
+                               function = "pcie1_rst";
+                               drive-strength = <12>;
+                               bias-disable;
                        };
 
-                       pcie1_pins: pcie1_pinmux {
-                               mux {
-                                       pins = "gpio48";
-                                       function = "pcie2_rst";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
+                       pcie1_pins: pcie1-state {
+                               pins = "gpio48";
+                               function = "pcie2_rst";
+                               drive-strength = <12>;
+                               bias-disable;
                        };
 
-                       pcie2_pins: pcie2_pinmux {
-                               mux {
-                                       pins = "gpio63";
-                                       function = "pcie3_rst";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
+                       pcie2_pins: pcie2-state {
+                               pins = "gpio63";
+                               function = "pcie3_rst";
+                               drive-strength = <12>;
+                               bias-disable;
                        };
 
-                       i2c4_pins: i2c4-default {
+                       i2c4_pins: i2c4-state {
                                pins = "gpio12", "gpio13";
                                function = "gsbi4";
                                drive-strength = <12>;
                                bias-disable;
                        };
 
-                       spi_pins: spi_pins {
-                               mux {
-                                       pins = "gpio18", "gpio19", "gpio21";
-                                       function = "gsbi5";
-                                       drive-strength = <10>;
-                                       bias-none;
-                               };
+                       spi_pins: spi-state {
+                               pins = "gpio18", "gpio19", "gpio21";
+                               function = "gsbi5";
+                               drive-strength = <10>;
+                               bias-disable;
                        };
 
-                       leds_pins: leds_pins {
-                               mux {
-                                       pins = "gpio7", "gpio8", "gpio9",
-                                              "gpio26", "gpio53";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-down;
-                                       output-low;
-                               };
+                       leds_pins: leds-state {
+                               pins = "gpio7", "gpio8", "gpio9",
+                                       "gpio26", "gpio53";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-pull-down;
+                               output-low;
                        };
 
-                       buttons_pins: buttons_pins {
-                               mux {
-                                       pins = "gpio54";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
+                       buttons_pins: buttons-state {
+                               pins = "gpio54";
+                               drive-strength = <2>;
+                               bias-pull-up;
                        };
 
-                       nand_pins: nand_pins {
-                               mux {
+                       nand_pins: nand-state {
+                               nand-pins {
                                        pins = "gpio34", "gpio35", "gpio36",
                                               "gpio37", "gpio38", "gpio39",
                                               "gpio40", "gpio41", "gpio42",
@@ -473,14 +461,14 @@
                                        bias-disable;
                                };
 
-                               pullups {
+                               nand-pullup-pins {
                                        pins = "gpio39";
                                        function = "nand";
                                        drive-strength = <10>;
                                        bias-pull-up;
                                };
 
-                               hold {
+                               nand-hold-pins {
                                        pins = "gpio40", "gpio41", "gpio42",
                                               "gpio43", "gpio44", "gpio45",
                                               "gpio46", "gpio47";
@@ -490,25 +478,21 @@
                                };
                        };
 
-                       mdio0_pins: mdio0-pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
+                       mdio0_pins: mdio0-state {
+                               pins = "gpio0", "gpio1";
+                               function = "mdio";
+                               drive-strength = <8>;
+                               bias-disable;
                        };
 
-                       rgmii2_pins: rgmii2-pins {
-                               mux {
-                                       pins = "gpio27", "gpio28", "gpio29",
-                                              "gpio30", "gpio31", "gpio32",
-                                              "gpio51", "gpio52", "gpio59",
-                                              "gpio60", "gpio61", "gpio62";
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
+                       rgmii2_pins: rgmii2-state {
+                               pins = "gpio27", "gpio28", "gpio29",
+                                       "gpio30", "gpio31", "gpio32",
+                                       "gpio51", "gpio52", "gpio59",
+                                       "gpio60", "gpio61", "gpio62";
+                               function = "rgmii2";
+                               drive-strength = <8>;
+                               bias-disable;
                        };
                };