Drop arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch b/queue-4.14/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index d070caf..0000000
--- a/queue-4.14/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From d70a816c3f04b292217180e2759206c8ddd5bc90 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:54 +0300
-Subject: ARM: dts: am335x: align GPIO hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit fb97f63106f3174992a22fe5e42dda96a0810750 ]
-
-The GPIO Hog dt-schema node naming convention expect GPIO hogs node names
-to end with a 'hog' suffix.
-
-Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +-
- arch/arm/boot/dts/am335x-boneblue.dts           | 2 +-
- arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 ++--
- arch/arm/boot/dts/am335x-icev2.dts              | 4 ++--
- arch/arm/boot/dts/am335x-shc.dts                | 8 ++++----
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-index 83f49f616b19..d8a712938a70 100644
---- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-@@ -105,7 +105,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
-index cdc1b2be792f..d32abbfcd6fb 100644
---- a/arch/arm/boot/dts/am335x-boneblue.dts
-+++ b/arch/arm/boot/dts/am335x-boneblue.dts
-@@ -451,7 +451,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-index 57731f0daf10..04c52194fa91 100644
---- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-@@ -105,7 +105,7 @@
- };
- 
- &gpio1 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;
-               output-high;
-@@ -122,7 +122,7 @@
- /* an external pulldown on U21 pin 4.                                  */
- 
- &gpio3 {
--      bt_aud_in {
-+      bt-aud-in-hog {
-               gpio-hog;
-               gpios = <16 GPIO_ACTIVE_HIGH>;
-               output-low;
-diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
-index f2005ecca74f..be81b98da71e 100644
---- a/arch/arm/boot/dts/am335x-icev2.dts
-+++ b/arch/arm/boot/dts/am335x-icev2.dts
-@@ -448,14 +448,14 @@
- };
- 
- &gpio3 {
--      p4 {
-+      pr1-mii-ctl-hog {
-               gpio-hog;
-               gpios = <4 GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "PR1_MII_CTRL";
-       };
- 
--      p10 {
-+      mux-mii-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               /* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */
-diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
-index 4f6a286ea293..961a422256cf 100644
---- a/arch/arm/boot/dts/am335x-shc.dts
-+++ b/arch/arm/boot/dts/am335x-shc.dts
-@@ -146,14 +146,14 @@
- };
- 
- &gpio1 {
--      hmtc_rst {
-+      hmtc-rst-hog {
-               gpio-hog;
-               gpios = <24 GPIO_ACTIVE_LOW>;
-               output-high;
-               line-name = "homematic_reset";
-       };
- 
--      hmtc_prog {
-+      hmtc-prog-hog {
-               gpio-hog;
-               gpios = <27 GPIO_ACTIVE_LOW>;
-               output-high;
-@@ -162,14 +162,14 @@
- };
- 
- &gpio3 {
--      zgb_rst {
-+      zgb-rst-hog {
-               gpio-hog;
-               gpios = <18 GPIO_ACTIVE_LOW>;
-               output-low;
-               line-name = "zigbee_reset";
-       };
- 
--      zgb_boot {
-+      zgb-boot-hog {
-               gpio-hog;
-               gpios = <19 GPIO_ACTIVE_HIGH>;
-               output-high;
--- 
-2.30.2
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 815f8ba3ec73832741092dbc24b7f4b6e3891d46..e124e87e7bfbe361259f11c4e4a9446cd651c136 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -11,7 +11,6 @@ arm-nsp-dts-fix-nand-nodes-names.patch
 arm-dts-bcm63xx-fix-nand-nodes-names.patch
 arm-dts-imx6-phyflex-fix-uart-hardware-flow-control.patch
 arm-imx-pm-imx5-fix-references-to-imx5_cpu_suspend_i.patch
-arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch
 arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch

diff --git a/queue-4.19/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch b/queue-4.19/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index 21bd5b2..0000000
--- a/queue-4.19/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From fb202b85188005d6641c97cf51ad858a2b033488 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:54 +0300
-Subject: ARM: dts: am335x: align GPIO hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit fb97f63106f3174992a22fe5e42dda96a0810750 ]
-
-The GPIO Hog dt-schema node naming convention expect GPIO hogs node names
-to end with a 'hog' suffix.
-
-Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +-
- arch/arm/boot/dts/am335x-boneblue.dts           | 2 +-
- arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 ++--
- arch/arm/boot/dts/am335x-icev2.dts              | 4 ++--
- arch/arm/boot/dts/am335x-shc.dts                | 8 ++++----
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-index 83f49f616b19..d8a712938a70 100644
---- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-@@ -105,7 +105,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
-index 7bcd72691f06..f71dac2b72d9 100644
---- a/arch/arm/boot/dts/am335x-boneblue.dts
-+++ b/arch/arm/boot/dts/am335x-boneblue.dts
-@@ -526,7 +526,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-index 57731f0daf10..04c52194fa91 100644
---- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-@@ -105,7 +105,7 @@
- };
- 
- &gpio1 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;
-               output-high;
-@@ -122,7 +122,7 @@
- /* an external pulldown on U21 pin 4.                                  */
- 
- &gpio3 {
--      bt_aud_in {
-+      bt-aud-in-hog {
-               gpio-hog;
-               gpios = <16 GPIO_ACTIVE_HIGH>;
-               output-low;
-diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
-index f2005ecca74f..be81b98da71e 100644
---- a/arch/arm/boot/dts/am335x-icev2.dts
-+++ b/arch/arm/boot/dts/am335x-icev2.dts
-@@ -448,14 +448,14 @@
- };
- 
- &gpio3 {
--      p4 {
-+      pr1-mii-ctl-hog {
-               gpio-hog;
-               gpios = <4 GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "PR1_MII_CTRL";
-       };
- 
--      p10 {
-+      mux-mii-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               /* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */
-diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
-index 4f6a286ea293..961a422256cf 100644
---- a/arch/arm/boot/dts/am335x-shc.dts
-+++ b/arch/arm/boot/dts/am335x-shc.dts
-@@ -146,14 +146,14 @@
- };
- 
- &gpio1 {
--      hmtc_rst {
-+      hmtc-rst-hog {
-               gpio-hog;
-               gpios = <24 GPIO_ACTIVE_LOW>;
-               output-high;
-               line-name = "homematic_reset";
-       };
- 
--      hmtc_prog {
-+      hmtc-prog-hog {
-               gpio-hog;
-               gpios = <27 GPIO_ACTIVE_LOW>;
-               output-high;
-@@ -162,14 +162,14 @@
- };
- 
- &gpio3 {
--      zgb_rst {
-+      zgb-rst-hog {
-               gpio-hog;
-               gpios = <18 GPIO_ACTIVE_LOW>;
-               output-low;
-               line-name = "zigbee_reset";
-       };
- 
--      zgb_boot {
-+      zgb-boot-hog {
-               gpio-hog;
-               gpios = <19 GPIO_ACTIVE_HIGH>;
-               output-high;
--- 
-2.30.2
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 2785860900b3f79853b529748de9567a130a033b..9493ede36d241c2075d755d3336064c0d8ed3e94 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -15,7 +15,6 @@ arm-dts-hurricane-2-fix-nand-nodes-names.patch
 arm-dts-imx6-phyflex-fix-uart-hardware-flow-control.patch
 arm-imx-pm-imx5-fix-references-to-imx5_cpu_suspend_i.patch
 rtc-mxc_v2-add-missing-module_device_table.patch
-arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch
 arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch

diff --git a/queue-5.10/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch b/queue-5.10/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index cb9f758..0000000
--- a/queue-5.10/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 32f1328a8330655e054bc484d72bcaf52e7bedef Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:54 +0300
-Subject: ARM: dts: am335x: align GPIO hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit fb97f63106f3174992a22fe5e42dda96a0810750 ]
-
-The GPIO Hog dt-schema node naming convention expect GPIO hogs node names
-to end with a 'hog' suffix.
-
-Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +-
- arch/arm/boot/dts/am335x-boneblue.dts           | 2 +-
- arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 ++--
- arch/arm/boot/dts/am335x-icev2.dts              | 4 ++--
- arch/arm/boot/dts/am335x-shc.dts                | 8 ++++----
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-index 86cad9912906..80116646a3fe 100644
---- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-@@ -101,7 +101,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
-index c696d57cf364..239b32a04eb4 100644
---- a/arch/arm/boot/dts/am335x-boneblue.dts
-+++ b/arch/arm/boot/dts/am335x-boneblue.dts
-@@ -412,7 +412,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-index 7615327d906a..74db0fc39397 100644
---- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-@@ -101,7 +101,7 @@
- };
- 
- &gpio1 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;
-               output-high;
-@@ -118,7 +118,7 @@
- /* an external pulldown on U21 pin 4.                                  */
- 
- &gpio3 {
--      bt_aud_in {
-+      bt-aud-in-hog {
-               gpio-hog;
-               gpios = <16 GPIO_ACTIVE_HIGH>;
-               output-low;
-diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
-index b958ab56a412..ed45079a68ff 100644
---- a/arch/arm/boot/dts/am335x-icev2.dts
-+++ b/arch/arm/boot/dts/am335x-icev2.dts
-@@ -458,14 +458,14 @@
- };
- 
- &gpio3 {
--      p4 {
-+      pr1-mii-ctl-hog {
-               gpio-hog;
-               gpios = <4 GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "PR1_MII_CTRL";
-       };
- 
--      p10 {
-+      mux-mii-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               /* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */
-diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
-index 1eaa26533466..2bfe60d32783 100644
---- a/arch/arm/boot/dts/am335x-shc.dts
-+++ b/arch/arm/boot/dts/am335x-shc.dts
-@@ -140,14 +140,14 @@
- };
- 
- &gpio1 {
--      hmtc_rst {
-+      hmtc-rst-hog {
-               gpio-hog;
-               gpios = <24 GPIO_ACTIVE_LOW>;
-               output-high;
-               line-name = "homematic_reset";
-       };
- 
--      hmtc_prog {
-+      hmtc-prog-hog {
-               gpio-hog;
-               gpios = <27 GPIO_ACTIVE_LOW>;
-               output-high;
-@@ -156,14 +156,14 @@
- };
- 
- &gpio3 {
--      zgb_rst {
-+      zgb-rst-hog {
-               gpio-hog;
-               gpios = <18 GPIO_ACTIVE_LOW>;
-               output-low;
-               line-name = "zigbee_reset";
-       };
- 
--      zgb_boot {
-+      zgb-boot-hog {
-               gpio-hog;
-               gpios = <19 GPIO_ACTIVE_HIGH>;
-               output-high;
--- 
-2.30.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 6a39b853c22a02e3250fd80897783417b83118d2..1a3735d8e230f37b5dc8deaf500aa7b98edff874 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -29,7 +29,6 @@ rtc-mxc_v2-add-missing-module_device_table.patch
 arm64-dts-renesas-beacon-fix-usb-extal-reference.patch
 arm64-dts-renesas-beacon-fix-usb-ref-clock-reference.patch
 kbuild-sink-stdout-from-cmd-for-silent-build.patch
-arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch

diff --git a/queue-5.13/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch b/queue-5.13/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index ec7ec29..0000000
--- a/queue-5.13/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From af1b2260b0408d9feadb0217c4bd5674cae62218 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:54 +0300
-Subject: ARM: dts: am335x: align GPIO hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit fb97f63106f3174992a22fe5e42dda96a0810750 ]
-
-The GPIO Hog dt-schema node naming convention expect GPIO hogs node names
-to end with a 'hog' suffix.
-
-Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +-
- arch/arm/boot/dts/am335x-boneblue.dts           | 2 +-
- arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 ++--
- arch/arm/boot/dts/am335x-icev2.dts              | 4 ++--
- arch/arm/boot/dts/am335x-shc.dts                | 8 ++++----
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-index 86cad9912906..80116646a3fe 100644
---- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-@@ -101,7 +101,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
-index 69acaf4ea0f3..0afcc2ee0b63 100644
---- a/arch/arm/boot/dts/am335x-boneblue.dts
-+++ b/arch/arm/boot/dts/am335x-boneblue.dts
-@@ -436,7 +436,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-index 7615327d906a..74db0fc39397 100644
---- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-@@ -101,7 +101,7 @@
- };
- 
- &gpio1 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;
-               output-high;
-@@ -118,7 +118,7 @@
- /* an external pulldown on U21 pin 4.                                  */
- 
- &gpio3 {
--      bt_aud_in {
-+      bt-aud-in-hog {
-               gpio-hog;
-               gpios = <16 GPIO_ACTIVE_HIGH>;
-               output-low;
-diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
-index e923d065304d..5e598ac96dcc 100644
---- a/arch/arm/boot/dts/am335x-icev2.dts
-+++ b/arch/arm/boot/dts/am335x-icev2.dts
-@@ -458,14 +458,14 @@
- };
- 
- &gpio3 {
--      p4 {
-+      pr1-mii-ctl-hog {
-               gpio-hog;
-               gpios = <4 GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "PR1_MII_CTRL";
-       };
- 
--      p10 {
-+      mux-mii-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               /* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */
-diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
-index 1eaa26533466..2bfe60d32783 100644
---- a/arch/arm/boot/dts/am335x-shc.dts
-+++ b/arch/arm/boot/dts/am335x-shc.dts
-@@ -140,14 +140,14 @@
- };
- 
- &gpio1 {
--      hmtc_rst {
-+      hmtc-rst-hog {
-               gpio-hog;
-               gpios = <24 GPIO_ACTIVE_LOW>;
-               output-high;
-               line-name = "homematic_reset";
-       };
- 
--      hmtc_prog {
-+      hmtc-prog-hog {
-               gpio-hog;
-               gpios = <27 GPIO_ACTIVE_LOW>;
-               output-high;
-@@ -156,14 +156,14 @@
- };
- 
- &gpio3 {
--      zgb_rst {
-+      zgb-rst-hog {
-               gpio-hog;
-               gpios = <18 GPIO_ACTIVE_LOW>;
-               output-low;
-               line-name = "zigbee_reset";
-       };
- 
--      zgb_boot {
-+      zgb-boot-hog {
-               gpio-hog;
-               gpios = <19 GPIO_ACTIVE_HIGH>;
-               output-high;
--- 
-2.30.2
-

diff --git a/queue-5.13/series b/queue-5.13/series
index 0c3f552a8910f4fbac3701c05f2248e82ce4e481..9d793b5e4201b87b053602e9415fc504f4fc4f91 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -36,7 +36,6 @@ rtc-mxc_v2-add-missing-module_device_table.patch
 arm64-dts-renesas-beacon-fix-usb-extal-reference.patch
 arm64-dts-renesas-beacon-fix-usb-ref-clock-reference.patch
 kbuild-sink-stdout-from-cmd-for-silent-build.patch
-arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch

diff --git a/queue-5.4/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch b/queue-5.4/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index c844641..0000000
--- a/queue-5.4/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 8ee18b7ca54ece6dac127e308659bf760057a84f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:54 +0300
-Subject: ARM: dts: am335x: align GPIO hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit fb97f63106f3174992a22fe5e42dda96a0810750 ]
-
-The GPIO Hog dt-schema node naming convention expect GPIO hogs node names
-to end with a 'hog' suffix.
-
-Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +-
- arch/arm/boot/dts/am335x-boneblue.dts           | 2 +-
- arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 ++--
- arch/arm/boot/dts/am335x-icev2.dts              | 4 ++--
- arch/arm/boot/dts/am335x-shc.dts                | 8 ++++----
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-index 3124d94c0b3c..3056c3e3e312 100644
---- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-@@ -102,7 +102,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
-index 2f6652ef9a15..8b98aa2d9588 100644
---- a/arch/arm/boot/dts/am335x-boneblue.dts
-+++ b/arch/arm/boot/dts/am335x-boneblue.dts
-@@ -435,7 +435,7 @@
- };
- 
- &gpio3 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               output-high;
-diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-index 4092cd193b8a..8d85c6a851c3 100644
---- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-@@ -102,7 +102,7 @@
- };
- 
- &gpio1 {
--      ls_buf_en {
-+      ls-buf-en-hog {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;
-               output-high;
-@@ -119,7 +119,7 @@
- /* an external pulldown on U21 pin 4.                                  */
- 
- &gpio3 {
--      bt_aud_in {
-+      bt-aud-in-hog {
-               gpio-hog;
-               gpios = <16 GPIO_ACTIVE_HIGH>;
-               output-low;
-diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
-index 204bccfcc110..1e52dfe4f2d3 100644
---- a/arch/arm/boot/dts/am335x-icev2.dts
-+++ b/arch/arm/boot/dts/am335x-icev2.dts
-@@ -445,14 +445,14 @@
- };
- 
- &gpio3 {
--      p4 {
-+      pr1-mii-ctl-hog {
-               gpio-hog;
-               gpios = <4 GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "PR1_MII_CTRL";
-       };
- 
--      p10 {
-+      mux-mii-hog {
-               gpio-hog;
-               gpios = <10 GPIO_ACTIVE_HIGH>;
-               /* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */
-diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
-index 5b0368504015..852cf61478e6 100644
---- a/arch/arm/boot/dts/am335x-shc.dts
-+++ b/arch/arm/boot/dts/am335x-shc.dts
-@@ -144,14 +144,14 @@
- };
- 
- &gpio1 {
--      hmtc_rst {
-+      hmtc-rst-hog {
-               gpio-hog;
-               gpios = <24 GPIO_ACTIVE_LOW>;
-               output-high;
-               line-name = "homematic_reset";
-       };
- 
--      hmtc_prog {
-+      hmtc-prog-hog {
-               gpio-hog;
-               gpios = <27 GPIO_ACTIVE_LOW>;
-               output-high;
-@@ -160,14 +160,14 @@
- };
- 
- &gpio3 {
--      zgb_rst {
-+      zgb-rst-hog {
-               gpio-hog;
-               gpios = <18 GPIO_ACTIVE_LOW>;
-               output-low;
-               line-name = "zigbee_reset";
-       };
- 
--      zgb_boot {
-+      zgb-boot-hog {
-               gpio-hog;
-               gpios = <19 GPIO_ACTIVE_HIGH>;
-               output-high;
--- 
-2.30.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index c6f925990c5799ca76649efdf38057a757980888..cc09b273648dc8e5ad7b6b21675f7e67fd163035 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -19,7 +19,6 @@ arm-dts-imx6-phyflex-fix-uart-hardware-flow-control.patch
 arm-imx-pm-imx5-fix-references-to-imx5_cpu_suspend_i.patch
 rtc-mxc_v2-add-missing-module_device_table.patch
 kbuild-sink-stdout-from-cmd-for-silent-build.patch
-arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch