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

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

diff --git a/queue-5.10/arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch b/queue-5.10/arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index b19fc6c..0000000
--- a/queue-5.10/arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From de23fd3f91de789aeeef98f7efdfe493fcf6a066 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:56 +0300
-Subject: ARM: dts: omap3: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit cfb4ab3b5df86c6001127346d8331f5e87012f91 ]
-
-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/omap3-evm-processor-common.dtsi | 2 +-
- arch/arm/boot/dts/omap3-gta04a5.dts               | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/omap3-evm-processor-common.dtsi b/arch/arm/boot/dts/omap3-evm-processor-common.dtsi
-index b4109f48ec18..e6ba30a21166 100644
---- a/arch/arm/boot/dts/omap3-evm-processor-common.dtsi
-+++ b/arch/arm/boot/dts/omap3-evm-processor-common.dtsi
-@@ -195,7 +195,7 @@
-  * for bus switch SN74CB3Q3384A, level-shifter SN74AVC16T245DGGR, and 1.8V.
-  */
- &gpio2 {
--      en_usb2_port {
-+      en-usb2-port-hog {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;  /* gpio_61 */
-               output-low;
-diff --git a/arch/arm/boot/dts/omap3-gta04a5.dts b/arch/arm/boot/dts/omap3-gta04a5.dts
-index fd84bbf3b9cc..9ce8d81250aa 100644
---- a/arch/arm/boot/dts/omap3-gta04a5.dts
-+++ b/arch/arm/boot/dts/omap3-gta04a5.dts
-@@ -37,7 +37,7 @@
- };
- 
- &gpio5 {
--      irda_en {
-+      irda-en-hog {
-               gpio-hog;
-               gpios = <(175-160) GPIO_ACTIVE_HIGH>;
-               output-high;    /* activate gpio_175 to disable IrDA receiver */
--- 
-2.30.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 5912e17075ae13a365bd1bde1731051c88412dc5..6672ac16293692f9e125a32a36611eab225faae3 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -28,7 +28,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-omap3-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch
 arm-dts-am57xx-cl-som-am57x-fix-ti-no-reset-on-init-.patch
 arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch

diff --git a/queue-5.13/arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch b/queue-5.13/arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index 5d25450..0000000
--- a/queue-5.13/arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 46443d5c8a373d884373a6f1f0e7000cc96c47fd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:56 +0300
-Subject: ARM: dts: omap3: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit cfb4ab3b5df86c6001127346d8331f5e87012f91 ]
-
-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/omap3-evm-processor-common.dtsi | 2 +-
- arch/arm/boot/dts/omap3-gta04a5.dts               | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/omap3-evm-processor-common.dtsi b/arch/arm/boot/dts/omap3-evm-processor-common.dtsi
-index b4109f48ec18..e6ba30a21166 100644
---- a/arch/arm/boot/dts/omap3-evm-processor-common.dtsi
-+++ b/arch/arm/boot/dts/omap3-evm-processor-common.dtsi
-@@ -195,7 +195,7 @@
-  * for bus switch SN74CB3Q3384A, level-shifter SN74AVC16T245DGGR, and 1.8V.
-  */
- &gpio2 {
--      en_usb2_port {
-+      en-usb2-port-hog {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;  /* gpio_61 */
-               output-low;
-diff --git a/arch/arm/boot/dts/omap3-gta04a5.dts b/arch/arm/boot/dts/omap3-gta04a5.dts
-index fd84bbf3b9cc..9ce8d81250aa 100644
---- a/arch/arm/boot/dts/omap3-gta04a5.dts
-+++ b/arch/arm/boot/dts/omap3-gta04a5.dts
-@@ -37,7 +37,7 @@
- };
- 
- &gpio5 {
--      irda_en {
-+      irda-en-hog {
-               gpio-hog;
-               gpios = <(175-160) GPIO_ACTIVE_HIGH>;
-               output-high;    /* activate gpio_175 to disable IrDA receiver */
--- 
-2.30.2
-

diff --git a/queue-5.13/series b/queue-5.13/series
index 0744578045c7402e49ec95174f71cbdabe249600..3c7262e969e0d191ae954232cd9bb8ce1249ff25 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -35,7 +35,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-omap3-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch
 arm-dts-am57xx-cl-som-am57x-fix-ti-no-reset-on-init-.patch
 arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch

diff --git a/queue-5.4/arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch b/queue-5.4/arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index ad392be..0000000
--- a/queue-5.4/arm-dts-omap3-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From fdec93bd4cdba5d12c811823301b4b57f918dd07 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:56 +0300
-Subject: ARM: dts: omap3: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit cfb4ab3b5df86c6001127346d8331f5e87012f91 ]
-
-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/omap3-evm-processor-common.dtsi | 2 +-
- arch/arm/boot/dts/omap3-gta04a5.dts               | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/omap3-evm-processor-common.dtsi b/arch/arm/boot/dts/omap3-evm-processor-common.dtsi
-index b4109f48ec18..e6ba30a21166 100644
---- a/arch/arm/boot/dts/omap3-evm-processor-common.dtsi
-+++ b/arch/arm/boot/dts/omap3-evm-processor-common.dtsi
-@@ -195,7 +195,7 @@
-  * for bus switch SN74CB3Q3384A, level-shifter SN74AVC16T245DGGR, and 1.8V.
-  */
- &gpio2 {
--      en_usb2_port {
-+      en-usb2-port-hog {
-               gpio-hog;
-               gpios = <29 GPIO_ACTIVE_HIGH>;  /* gpio_61 */
-               output-low;
-diff --git a/arch/arm/boot/dts/omap3-gta04a5.dts b/arch/arm/boot/dts/omap3-gta04a5.dts
-index fd84bbf3b9cc..9ce8d81250aa 100644
---- a/arch/arm/boot/dts/omap3-gta04a5.dts
-+++ b/arch/arm/boot/dts/omap3-gta04a5.dts
-@@ -37,7 +37,7 @@
- };
- 
- &gpio5 {
--      irda_en {
-+      irda-en-hog {
-               gpio-hog;
-               gpios = <(175-160) GPIO_ACTIVE_HIGH>;
-               output-high;    /* activate gpio_175 to disable IrDA receiver */
--- 
-2.30.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 10ef89bf3730982722e1dd5536bca95b79e8bbd3..7e5dd0e826bdde6cb13b4ab96ccac49da15ad0e1 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-omap3-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch
 arm-dts-am57xx-cl-som-am57x-fix-ti-no-reset-on-init-.patch
 arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch