arm64: zynqmp: Rename i2c?-gpio to i2c?-gpio-grp

Anything ending with gpio/gpios is taken as gpio phande/description which
is reported as the issue coming from gpio-consumer.yaml schema.
That's why rename the gpio suffix to gpio-grp to avoid name collision.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/407b0b67ba019be5a2073d09d578b381c639cbc6.1703002605.git.michal.simek@amd.com

diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts
index 6083f99dc8d48a526c229db837be2609f72e9440..7864b4b8bbbda9db6447ce5858f7a1bbd4917fbe 100644 (file)
--- a/arch/arm/dts/zynq-zc702.dts
+++ b/arch/arm/dts/zynq-zc702.dts
@@ -294,7 +294,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_50_grp", "gpio0_51_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-sc-revB.dts b/arch/arm/dts/zynqmp-sc-revB.dts
index e0b554c9c545dc854f0a1131c67e851061663e70..f7349fdc3b4c4671fcc70e94cd0b0b8b0f17e807 100644 (file)
--- a/arch/arm/dts/zynqmp-sc-revB.dts
+++ b/arch/arm/dts/zynqmp-sc-revB.dts
@@ -344,7 +344,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_34_grp", "gpio0_35_grp";
                        function = "gpio0";
@@ -371,7 +371,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                conf {
                        groups = "gpio0_24_grp", "gpio0_25_grp";
                        slew-rate = <SLEW_RATE_SLOW>;

diff --git a/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso
index 298e80265e2a088d8baaece8c73b563f50e2c989..766f78303eee00e6f6eda8c26c4c1d01b1c545ee 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso
+++ b/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso
@@ -225,7 +225,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                conf {
                        groups = "gpio0_24_grp", "gpio0_25_grp";
                        slew-rate = <SLEW_RATE_SLOW>;

diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso
index 95b1dc5aa571805813041bfa1e3c55c8199bae0e..57cd9ba13e782cbfd6166ecc67200761741292e6 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso
+++ b/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso
@@ -274,7 +274,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                conf {
                        groups = "gpio0_24_grp", "gpio0_25_grp";
                        slew-rate = <SLEW_RATE_SLOW>;

diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso b/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso
index e2387a2abb8fa15195acf9fe510e9a89520aa166..21187396326b44523e4f54f8976614f80f0619fa 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso
+++ b/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso
@@ -274,7 +274,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                conf {
                        groups = "gpio0_24_grp", "gpio0_25_grp";
                        slew-rate = <SLEW_RATE_SLOW>;

diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso
index 04ae59290a0b3f9da899f3543ea90dbe83a663b7..6d0d5c487d2e7aae178474befa54165239f61a0e 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso
+++ b/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso
@@ -248,7 +248,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                conf {
                        groups = "gpio0_24_grp", "gpio0_25_grp";
                        slew-rate = <SLEW_RATE_SLOW>;

diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso
index adf3511ad3134df50ffb34ae5df0ea208823b6be..a4b4465d2038f083eac82b95bb1bf06dee41fa2f 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso
+++ b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso
@@ -235,7 +235,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                conf {
                        groups = "gpio0_24_grp", "gpio0_25_grp";
                        slew-rate = <SLEW_RATE_SLOW>;

diff --git a/arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts b/arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts
index 9ab8f5bfffe45cb47d4dcc0f24006e0cbacdd339..088545c87cee07e3a4373700820036da1cada301 100644 (file)
--- a/arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts
+++ b/arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts
@@ -400,7 +400,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_34_grp", "gpio0_35_grp";
                        function = "gpio0";
@@ -427,7 +427,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_36_grp", "gpio0_37_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-vpk120-revA.dts b/arch/arm/dts/zynqmp-vpk120-revA.dts
index ce76e0b3db3603d9e2972cbc8f42918c2a3c1bdb..fa6046eb95c40fe1253a41ffb9b5f381d2037e19 100644 (file)
--- a/arch/arm/dts/zynqmp-vpk120-revA.dts
+++ b/arch/arm/dts/zynqmp-vpk120-revA.dts
@@ -536,7 +536,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_34_grp", "gpio0_35_grp";
                        function = "gpio0";
@@ -563,7 +563,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_36_grp", "gpio0_37_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
index e72ed50b1cb214c6878c3e6b2ef2667f0c682ad7..27b38e981a0513c46498dfae58be697a7aa2b45f 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
@@ -148,7 +148,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_36_grp", "gpio0_37_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
index 160c6c58b36d5cdde5766d6d76874b6191895400..ff7069bc1249cd4b706d019bf27a633612f5011f 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
@@ -273,7 +273,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_6_grp", "gpio0_7_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts b/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts
index b1857e17ab7e8b95d62f03c60139a7e5bb8149ac..53aa3dca1dca270d4a316d6ec06f0c1526b81af9 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts
@@ -125,7 +125,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_74_grp", "gpio0_75_grp";
                        function = "gpio0";
@@ -152,7 +152,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_76_grp", "gpio0_77_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts
index 44d1b24677d1ade485920e3cfcea74caa8f13df4..49d5cdbba585d9b0715f59ed5629c9000fdc44ef 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu100-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
@@ -284,7 +284,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_4_grp", "gpio0_5_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index e166c9555069acbb265c8b06fc0feeba1f7ab8db..3132fa533b8ed0625ea47fbe6fe5ad0cb3c9eaa4 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -708,7 +708,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_14_grp", "gpio0_15_grp";
                        function = "gpio0";
@@ -735,7 +735,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_16_grp", "gpio0_17_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
index cdfeea2fdd84d127df92acbf5014ceaf0a9a3988..31effbf27a8e23d72b50f3e6fc2ca16fe567a9d3 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -272,7 +272,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_16_grp", "gpio0_17_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index 4b942acd4132b7fff93ef2e20e19893968342014..999b2431bdf2f4f808c07ac8b5c370fe39586125 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -284,7 +284,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_16_grp", "gpio0_17_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index b90ff61d2416592bf03c7739b836ef2239b048f4..ba3989cad3e47781e7620d2dd150f930f514aec4 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -719,7 +719,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_14_grp", "gpio0_15_grp";
                        function = "gpio0";
@@ -746,7 +746,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_16_grp", "gpio0_17_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index ba9e4891fccc1ae9a76433ddcb3d55fc7c2dfc96..787cf0d87f9fe0d27cbe73374c2ba697ae3be2f3 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -589,7 +589,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_14_grp", "gpio0_15_grp";
                        function = "gpio0";
@@ -616,7 +616,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_16_grp", "gpio0_17_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
index 22ad8d33a1165fdb5b3261e85a757eb8853cf7ca..b4e24745a9a6769334ff15fded99933ea51d4fa5 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu208-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
@@ -600,7 +600,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_14_grp", "gpio0_15_grp";
                        function = "gpio0";
@@ -627,7 +627,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_16_grp", "gpio0_17_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts
index 575ff5b1b77b2f3a134106b26e47f3300010445a..6f593e80841f66eb3b357344a4e5ea45a9e7b1ac 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu216-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
@@ -610,7 +610,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_14_grp", "gpio0_15_grp";
                        function = "gpio0";
@@ -637,7 +637,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_16_grp", "gpio0_17_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu670-revA.dts b/arch/arm/dts/zynqmp-zcu670-revA.dts
index edbbf0b30e7b7caef4bab56df66320b319425275..76410de1edca62b49bc2f2f086a4a58cee668432 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu670-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu670-revA.dts
@@ -573,7 +573,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_14_grp", "gpio0_15_grp";
                        function = "gpio0";
@@ -600,7 +600,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_16_grp", "gpio0_17_grp";
                        function = "gpio0";

diff --git a/arch/arm/dts/zynqmp-zcu670-revB.dts b/arch/arm/dts/zynqmp-zcu670-revB.dts
index 97599c5658fb19dbd788e0682060f279f8cd663b..c2dd9f696bf0a2a5b45bd7779c54a3c4a4c81c10 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu670-revB.dts
+++ b/arch/arm/dts/zynqmp-zcu670-revB.dts
@@ -573,7 +573,7 @@
                };
        };
 
-       pinctrl_i2c0_gpio: i2c0-gpio {
+       pinctrl_i2c0_gpio: i2c0-gpio-grp {
                mux {
                        groups = "gpio0_14_grp", "gpio0_15_grp";
                        function = "gpio0";
@@ -600,7 +600,7 @@
                };
        };
 
-       pinctrl_i2c1_gpio: i2c1-gpio {
+       pinctrl_i2c1_gpio: i2c1-gpio-grp {
                mux {
                        groups = "gpio0_16_grp", "gpio0_17_grp";
                        function = "gpio0";