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

Pass dtbs_check for qcom,ipq4019-pinctrl.yaml.

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-7-rayyan.ansari@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
index da67d55fa55730f848b2a0070d909a67d30b84c0..0d23c03fae33f1db4459dff5192210317e8c8d67 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
@@ -28,46 +28,42 @@
 };
 
 &tlmm {
-       i2c0_pins: i2c0_pinmux {
-               mux_i2c {
-                       function = "blsp_i2c0";
-                       pins = "gpio58", "gpio59";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
+       i2c0_pins: i2c0-state {
+               function = "blsp_i2c0";
+               pins = "gpio58", "gpio59";
+               drive-strength = <16>;
+               bias-disable;
        };
 
-       mdio_pins: mdio_pinmux {
-               mux_mdio {
+       mdio_pins: mdio-state {
+               mdio-pins {
                        pins = "gpio53";
                        function = "mdio";
                        bias-pull-up;
                };
 
-               mux_mdc {
+               mdc-pins {
                        pins = "gpio52";
                        function = "mdc";
                        bias-pull-up;
                };
        };
 
-       serial0_pins: serial0_pinmux {
-               mux_uart {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
+       serial0_pins: serial0-state {
+               pins = "gpio60", "gpio61";
+               function = "blsp_uart0";
+               bias-disable;
        };
 
-       spi0_pins: spi0_pinmux {
-               mux_spi {
+       spi0_pins: spi0-state {
+               spi0-pins {
                        function = "blsp_spi0";
                        pins = "gpio55", "gpio56", "gpio57";
                        drive-strength = <12>;
                        bias-disable;
                };
 
-               mux_cs {
+               spi0-cs-pins {
                        function = "gpio";
                        pins = "gpio54", "gpio4";
                        drive-strength = <2>;

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts b/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts
index 365fbac417fd1303ed3919d473ce98b3e53b1487..ac3b30072a22718ae1e129f79abfeb41af2bed7c 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts
@@ -11,40 +11,35 @@
 };
 
 &tlmm {
-       mdio_pins: mdio_pinmux {
-               pinmux_1 {
+       mdio_pins: mdio-state {
+               mdio-pins {
                        pins = "gpio53";
                        function = "mdio";
+                       bias-pull-up;
                };
 
-               pinmux_2 {
+               mdc-pins {
                        pins = "gpio52";
                        function = "mdc";
-               };
-
-               pinconf {
-                       pins = "gpio52", "gpio53";
                        bias-pull-up;
                };
        };
 
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
+       serial_pins: serial-state{
+               pins = "gpio60", "gpio61";
+               function = "blsp_uart0";
+               bias-disable;
        };
 
-       spi_0_pins: spi_0_pinmux {
-               pin {
+       spi_0_pins: spi-0-state {
+               spi0-pins {
                        function = "blsp_spi0";
                        pins = "gpio55", "gpio56", "gpio57";
                        drive-strength = <2>;
                        bias-disable;
                };
 
-               pin_cs {
+               spi0-cs-pins {
                        function = "gpio";
                        pins = "gpio54", "gpio59";
                        drive-strength = <2>;

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1.dtsi
index f7ac8f9d0b6fc00e6363f2f42e8356591fed9cc5..efbe89dd47937ffc670fb40afb1c1e953ac5dca4 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1.dtsi
@@ -34,30 +34,22 @@
 };
 
 &tlmm {
-       serial_pins: serial_pinmux {
-               mux {
-                       pins = "gpio60", "gpio61";
-                       function = "blsp_uart0";
-                       bias-disable;
-               };
+       serial_pins: serial-state {
+               pins = "gpio60", "gpio61";
+               function = "blsp_uart0";
+               bias-disable;
        };
 
-       spi_0_pins: spi_0_pinmux {
-               pinmux {
-                       function = "blsp_spi0";
-                       pins = "gpio55", "gpio56", "gpio57";
-               };
-               pinmux_cs {
-                       function = "gpio";
-                       pins = "gpio54";
-               };
-               pinconf {
+       spi_0_pins: spi-0-state {
+               spi0-pins {
                        pins = "gpio55", "gpio56", "gpio57";
+                       function = "blsp_spi0";
                        drive-strength = <12>;
                        bias-disable;
                };
-               pinconf_cs {
+               spi0-cs-pins {
                        pins = "gpio54";
+                       function = "gpio";
                        drive-strength = <2>;
                        bias-disable;
                        output-high;

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1.dtsi
index 374af6dd360a72146071ec24b73b746adcacf636..91e296d2ea827ac56c678b1f51167f89ffd532fc 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1.dtsi
@@ -24,26 +24,26 @@
 
        soc {
                pinctrl@1000000 {
-                       serial_0_pins: serial0-pinmux {
+                       serial_0_pins: serial0-state {
                                pins = "gpio16", "gpio17";
                                function = "blsp_uart0";
                                bias-disable;
                        };
 
-                       serial_1_pins: serial1-pinmux {
+                       serial_1_pins: serial1-state {
                                pins = "gpio8", "gpio9",
                                        "gpio10", "gpio11";
                                function = "blsp_uart1";
                                bias-disable;
                        };
 
-                       spi_0_pins: spi-0-pinmux {
-                               pinmux {
+                       spi_0_pins: spi-0-state {
+                               spi0-pins {
                                        function = "blsp_spi0";
                                        pins = "gpio13", "gpio14", "gpio15";
                                        bias-disable;
                                };
-                               pinmux_cs {
+                               spi0-cs-pins {
                                        function = "gpio";
                                        pins = "gpio12";
                                        bias-disable;
@@ -51,13 +51,13 @@
                                };
                        };
 
-                       i2c_0_pins: i2c-0-pinmux {
+                       i2c_0_pins: i2c-0-state {
                                pins = "gpio20", "gpio21";
                                function = "blsp_i2c0";
                                bias-disable;
                        };
 
-                       nand_pins: nand-pins {
+                       nand_pins: nand-state {
                                pins = "gpio53", "gpio55", "gpio56",
                                        "gpio57", "gpio58", "gpio59",
                                        "gpio60", "gpio62", "gpio63",

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c1.dts b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c1.dts
index ea2987fcbff8d374c4448cb8e6923d43b21d9f4b..41c5874f6f976bd5f03d592d39eed8c7ac5a66a7 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c1.dts
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c1.dts
@@ -19,20 +19,20 @@
                };
 
                pinctrl@1000000 {
-                       serial_1_pins: serial1-pinmux {
+                       serial_1_pins: serial1-state {
                                pins = "gpio8", "gpio9",
                                        "gpio10", "gpio11";
                                function = "blsp_uart1";
                                bias-disable;
                        };
 
-                       spi_0_pins: spi-0-pinmux {
-                               pinmux {
+                       spi_0_pins: spi-0-state {
+                               spi0-pins {
                                        function = "blsp_spi0";
                                        pins = "gpio13", "gpio14", "gpio15";
                                        bias-disable;
                                };
-                               pinmux_cs {
+                               spio-cs-pins {
                                        function = "gpio";
                                        pins = "gpio12";
                                        bias-disable;

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c2.dts b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c2.dts
index bd3553dd2070bf456dd137e409d9525f66967bd2..67ee99d6975793ef1b978abe4cbbe36dc4de60c3 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c2.dts
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c2.dts
@@ -9,7 +9,7 @@
 
        soc {
                pinctrl@1000000 {
-                       serial_1_pins: serial1-pinmux {
+                       serial_1_pins: serial1-state {
                                pins = "gpio8", "gpio9";
                                function = "blsp_uart1";
                                bias-disable;

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1.dtsi
index 7ef635997efa4595ad9905cc6e562d14a401aa6c..cc88cf5f0d9bae86460947f7f72614a6ecd68044 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1.dtsi
@@ -24,19 +24,19 @@
 
        soc {
                pinctrl@1000000 {
-                       serial_0_pins: serial0-pinmux {
+                       serial_0_pins: serial0-state {
                                pins = "gpio16", "gpio17";
                                function = "blsp_uart0";
                                bias-disable;
                        };
 
-                       i2c_0_pins: i2c-0-pinmux {
+                       i2c_0_pins: i2c-0-state {
                                pins = "gpio20", "gpio21";
                                function = "blsp_i2c0";
                                bias-disable;
                        };
 
-                       nand_pins: nand-pins {
+                       nand_pins: nand-state {
                                pins = "gpio53", "gpio55", "gpio56",
                                       "gpio57", "gpio58", "gpio59",
                                       "gpio60", "gpio62", "gpio63",