ipq806x: reorganize nand_pins mux definition

It's wrong set the mux to bias-disable. The best way to
do this is by creating a separate group and disable the
specific pins.

By documentation, any subgroup with no bias definition
is ignored so the mux definition is useless.
Rework the definition by sremoving the mux subgroup and
set the remaining subgroup with the mux function and
drive-strength

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
index 8ef5b92b527e8a3e91998d052e5f70bd71b54bf5..02f60c90eeee718c763051ae789b3698c5db68ae 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
@@ -66,24 +66,27 @@
        };
 
        nand_pins: nand_pins {
-               mux {
+               disable {
                        pins = "gpio34", "gpio35", "gpio36",
-                              "gpio37", "gpio38", "gpio39",
-                              "gpio40", "gpio41", "gpio42",
-                              "gpio43", "gpio44", "gpio45",
-                              "gpio46", "gpio47";
+                              "gpio37", "gpio38";
                        function = "nand";
                        drive-strength = <10>;
                        bias-disable;
                };
+
                pullups {
                        pins = "gpio39";
+                       function = "nand";
+                       drive-strength = <10>;
                        bias-pull-up;
                };
+
                hold {
                        pins = "gpio40", "gpio41", "gpio42",
                               "gpio43", "gpio44", "gpio45",
                               "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
                        bias-bus-hold;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
index 6a16167e1f20e562a012daaa0a7f7d49ceb8e5fa..de347643dc9a6dfadd75913ecc27a586b7b20f95 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
+++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
@@ -45,24 +45,27 @@
                                };
                        };
                        nand_pins: nand_pins {
-                               mux {
+                               disable {
                                        pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38", "gpio39",
-                                              "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
+                                              "gpio37", "gpio38";
                                        function = "nand";
                                        drive-strength = <10>;
                                        bias-disable;
                                };
+
                                pullups {
                                        pins = "gpio39";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-pull-up;
                                };
+
                                hold {
                                        pins = "gpio40", "gpio41", "gpio42",
                                               "gpio43", "gpio44", "gpio45",
                                               "gpio46", "gpio47";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-bus-hold;
                                };
                        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index ac1a965896c2e7a20ed6826b493c5bd764df4110..241c00962a56af9fbf7a266dd84531b729a7344f 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -76,24 +76,27 @@
                        };
 
                        nand_pins: nand_pins {
-                               mux {
+                               disable {
                                        pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38", "gpio39",
-                                              "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
+                                              "gpio37", "gpio38";
                                        function = "nand";
                                        drive-strength = <10>;
                                        bias-disable;
                                };
+
                                pullups {
                                        pins = "gpio39";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-pull-up;
                                };
+
                                hold {
                                        pins = "gpio40", "gpio41", "gpio42",
                                               "gpio43", "gpio44", "gpio45",
                                               "gpio46", "gpio47";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-bus-hold;
                                };
                        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index 6f54e19da29716fddc2d07783ce997f78a253db7..b052ca6fcb1713598230f41f961be3f89546dbce 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
@@ -76,24 +76,27 @@
                        };
 
                        nand_pins: nand_pins {
-                               mux {
+                               disable {
                                        pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38", "gpio39",
-                                              "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
+                                              "gpio37", "gpio38";
                                        function = "nand";
                                        drive-strength = <10>;
                                        bias-disable;
                                };
+
                                pullups {
                                        pins = "gpio39";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-pull-up;
                                };
+
                                hold {
                                        pins = "gpio40", "gpio41", "gpio42",
                                               "gpio43", "gpio44", "gpio45",
                                               "gpio46", "gpio47";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-bus-hold;
                                };
                        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 8130b583d36828538330f157260c666f4fadb477..dd596f52b440a2aa4d57fd166686ad9aa87f2e6e 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -77,24 +77,27 @@
                        };
 
                        nand_pins: nand_pins {
-                               mux {
+                               disable {
                                        pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38", "gpio39",
-                                              "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
+                                              "gpio37", "gpio38";
                                        function = "nand";
                                        drive-strength = <10>;
                                        bias-disable;
                                };
+
                                pullups {
                                        pins = "gpio39";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-pull-up;
                                };
+
                                hold {
                                        pins = "gpio40", "gpio41", "gpio42",
                                               "gpio43", "gpio44", "gpio45",
                                               "gpio46", "gpio47";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-bus-hold;
                                };
                        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index 21287ef9d7bdb285e3d7f3fec0cc37c161d25b2e..463c0abb40153101c4fd61d2a3ddf5661f132cbe 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -81,24 +81,27 @@
                        };
 
                        nand_pins: nand_pins {
-                               mux {
+                               disable {
                                        pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38", "gpio39",
-                                              "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
+                                              "gpio37", "gpio38";
                                        function = "nand";
                                        drive-strength = <10>;
                                        bias-disable;
                                };
+
                                pullups {
                                        pins = "gpio39";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-pull-up;
                                };
+
                                hold {
                                        pins = "gpio40", "gpio41", "gpio42",
                                               "gpio43", "gpio44", "gpio45",
                                               "gpio46", "gpio47";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-bus-hold;
                                };
                        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index 280dc88569fd1c48ec11790076def8ec780ef0ff..a1e7791d12df7228e677896abb39be68a974b77c 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
@@ -504,11 +504,9 @@
        };
 
        nand_pins: nand_pins {
-               mux {
+               disable {
                        pins = "gpio34", "gpio35", "gpio36", "gpio37",
-                              "gpio38", "gpio39", "gpio40", "gpio41",
-                              "gpio42", "gpio43", "gpio44", "gpio45",
-                              "gpio46", "gpio47";
+                              "gpio38";
                        function = "nand";
                        drive-strength = <10>;
                        bias-disable;
@@ -516,12 +514,16 @@
 
                pullups {
                        pins = "gpio39";
+                       function = "nand";
+                       drive-strength = <10>;
                        bias-pull-up;
                };
 
                hold {
                        pins = "gpio40", "gpio41", "gpio42", "gpio43",
                               "gpio44", "gpio45", "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
                        bias-bus-hold;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index 12cfa3b0fc781c076ab701265520e8db05a6e33f..b4770102e272ccf421702745a6371437595c1713 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
@@ -473,12 +473,9 @@
        };
 
        nand_pins: nand_pins {
-               mux {
+               disable {
                        pins = "gpio34", "gpio35", "gpio36",
-                              "gpio37", "gpio38", "gpio39",
-                              "gpio40", "gpio41", "gpio42",
-                              "gpio43", "gpio44", "gpio45",
-                              "gpio46", "gpio47";
+                              "gpio37", "gpio38";
                        function = "nand";
                        drive-strength = <10>;
                        bias-disable;
@@ -486,6 +483,8 @@
 
                pullups {
                        pins = "gpio39";
+                       function = "nand";
+                       drive-strength = <10>;
                        bias-pull-up;
                };
 
@@ -493,6 +492,8 @@
                        pins = "gpio40", "gpio41", "gpio42",
                               "gpio43", "gpio44", "gpio45",
                               "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
                        bias-bus-hold;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index 6a1d016f7acac9a943622e804a7ceb1041e74fa1..f93039f7272d164cbb755398e37dfef386199a97 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -70,24 +70,27 @@
                        };
 
                        nand_pins: nand_pins {
-                               mux {
+                               disable {
                                        pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38", "gpio39",
-                                              "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
+                                              "gpio37", "gpio38";
                                        function = "nand";
                                        drive-strength = <10>;
                                        bias-disable;
                                };
+
                                pullups {
                                        pins = "gpio39";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-pull-up;
                                };
+
                                hold {
                                        pins = "gpio40", "gpio41", "gpio42",
                                               "gpio43", "gpio44", "gpio45",
                                               "gpio46", "gpio47";
+                                       function = "nand";
+                                       drive-strength = <10>;
                                        bias-bus-hold;
                                };
                        };