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

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

diff --git a/queue-4.14/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch b/queue-4.14/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index ddd8d50..0000000
--- a/queue-4.14/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1ecc8ee2afb41b1b2e6a3e001036e5425cf007e1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:55 +0300
-Subject: ARM: dts: am437x: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
-
-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/am437x-gp-evm.dts  | 4 ++--
- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
-index 051823b7e5a1..f36cb4105d18 100644
---- a/arch/arm/boot/dts/am437x-gp-evm.dts
-+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
-@@ -696,7 +696,7 @@
-       pinctrl-0 = <&gpio0_pins>;
-       status = "okay";
- 
--      p23 {
-+      sel-emmc-nand-hog {
-               gpio-hog;
-               gpios = <23 GPIO_ACTIVE_HIGH>;
-               /* SelEMMCorNAND selects between eMMC and NAND:
-@@ -729,7 +729,7 @@
-       status = "okay";
-       ti,no-reset-on-init;
- 
--      p8 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
-diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
-index c4279b0b9f12..22ab85fa895d 100644
---- a/arch/arm/boot/dts/am43x-epos-evm.dts
-+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
-@@ -527,7 +527,7 @@
-       pinctrl-0 = <&display_mux_pins>;
-       status = "okay";
- 
--      p1 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
--- 
-2.30.2
-

diff --git a/queue-4.14/series b/queue-4.14/series
index e124e87e7bfbe361259f11c4e4a9446cd651c136..d820ca5c6ef424e175fca41875d07869426304fb 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-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
 arm-dts-stm32-fix-rcc-node-name-on-stm32f429-mcu.patch

diff --git a/queue-4.19/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch b/queue-4.19/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index 49daf09..0000000
--- a/queue-4.19/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d946e38f783fdfe73c02b81bbb1a471ff74fdfbc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:55 +0300
-Subject: ARM: dts: am437x: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
-
-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/am437x-gp-evm.dts  | 4 ++--
- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
-index 8a17eca2bc97..7511b10182af 100644
---- a/arch/arm/boot/dts/am437x-gp-evm.dts
-+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
-@@ -698,7 +698,7 @@
-       pinctrl-0 = <&gpio0_pins>;
-       status = "okay";
- 
--      p23 {
-+      sel-emmc-nand-hog {
-               gpio-hog;
-               gpios = <23 GPIO_ACTIVE_HIGH>;
-               /* SelEMMCorNAND selects between eMMC and NAND:
-@@ -731,7 +731,7 @@
-       status = "okay";
-       ti,no-reset-on-init;
- 
--      p8 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
-diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
-index 02bbdfb3f258..07143ee48fed 100644
---- a/arch/arm/boot/dts/am43x-epos-evm.dts
-+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
-@@ -708,7 +708,7 @@
-       pinctrl-0 = <&display_mux_pins>;
-       status = "okay";
- 
--      p1 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
--- 
-2.30.2
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 9493ede36d241c2075d755d3336064c0d8ed3e94..675a5a195ec4db133e48fa3940fd007de1afa261 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-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
 arm-dts-stm32-fix-gpio-keys-node-on-stm32-mcu-boards.patch

diff --git a/queue-4.4/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch b/queue-4.4/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index 64fed5c..0000000
--- a/queue-4.4/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 57277059f3eb25b07d5f7a2a4f067690cb5ea371 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:55 +0300
-Subject: ARM: dts: am437x: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
-
-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/am437x-gp-evm.dts  | 4 ++--
- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
-index 3293484028ad..b5863cc13cfd 100644
---- a/arch/arm/boot/dts/am437x-gp-evm.dts
-+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
-@@ -660,7 +660,7 @@
-       pinctrl-0 = <&gpio0_pins>;
-       status = "okay";
- 
--      p23 {
-+      sel-emmc-nand-hog {
-               gpio-hog;
-               gpios = <23 GPIO_ACTIVE_HIGH>;
-               /* SelEMMCorNAND selects between eMMC and NAND:
-@@ -693,7 +693,7 @@
-       status = "okay";
-       ti,no-reset-on-init;
- 
--      p8 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
-diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
-index a74b09f17a1a..b61feb994526 100644
---- a/arch/arm/boot/dts/am43x-epos-evm.dts
-+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
-@@ -536,7 +536,7 @@
-       pinctrl-0 = <&display_mux_pins>;
-       status = "okay";
- 
--      p1 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
--- 
-2.30.2
-

diff --git a/queue-4.4/series b/queue-4.4/series
index 6dbcabd2f1fbd791479335fd0fd27714baf01de3..54f23e364521c5bff4212f3b75651909260576b9 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -2,7 +2,6 @@ arm-brcmstb-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-am437x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch
 thermal-core-correct-function-name-thermal_zone_devi.patch
 kbuild-mkcompile_h-consider-timestamp-if-kbuild_buil.patch

diff --git a/queue-4.9/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch b/queue-4.9/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index 7ee3903..0000000
--- a/queue-4.9/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From dbae02406b6f5350235ac2a65c6592b7675b56cb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:55 +0300
-Subject: ARM: dts: am437x: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
-
-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/am437x-gp-evm.dts  | 4 ++--
- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
-index b55c094893c6..58c3bda82e00 100644
---- a/arch/arm/boot/dts/am437x-gp-evm.dts
-+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
-@@ -665,7 +665,7 @@
-       pinctrl-0 = <&gpio0_pins>;
-       status = "okay";
- 
--      p23 {
-+      sel-emmc-nand-hog {
-               gpio-hog;
-               gpios = <23 GPIO_ACTIVE_HIGH>;
-               /* SelEMMCorNAND selects between eMMC and NAND:
-@@ -698,7 +698,7 @@
-       status = "okay";
-       ti,no-reset-on-init;
- 
--      p8 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
-diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
-index 21918807c9f6..a5a403231c39 100644
---- a/arch/arm/boot/dts/am43x-epos-evm.dts
-+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
-@@ -529,7 +529,7 @@
-       pinctrl-0 = <&display_mux_pins>;
-       status = "okay";
- 
--      p1 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
--- 
-2.30.2
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 13a66efd698f5f52f6b478cada70646e060ff97f..5e3898747e295d22b18b5b9f4f4202776fab7fb0 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -5,7 +5,6 @@ arm-brcmstb-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-am437x-align-gpio-hog-names-with-dt-schema.patch
 arm-dts-omap5-board-common-align-gpio-hog-names-with.patch
 arm-dts-stm32-fix-rcc-node-name-on-stm32f429-mcu.patch
 arm64-dts-juno-update-scpi-nodes-as-per-the-yaml-sch.patch

diff --git a/queue-5.10/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch b/queue-5.10/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index b5c6659..0000000
--- a/queue-5.10/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From be94a30a3e34de52638fd0bb0e992ce16c2a417e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:55 +0300
-Subject: ARM: dts: am437x: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
-
-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/am437x-gp-evm.dts  | 4 ++--
- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
-index 6e4d05d649e9..45cbc7fb557a 100644
---- a/arch/arm/boot/dts/am437x-gp-evm.dts
-+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
-@@ -786,7 +786,7 @@
-       pinctrl-0 = <&gpio0_pins>;
-       status = "okay";
- 
--      p23 {
-+      sel-emmc-nand-hog {
-               gpio-hog;
-               gpios = <23 GPIO_ACTIVE_HIGH>;
-               /* SelEMMCorNAND selects between eMMC and NAND:
-@@ -819,7 +819,7 @@
-       status = "okay";
-       ti,no-reset-on-init;
- 
--      p8 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
-diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
-index 8b696107eef8..aae0af10a5b1 100644
---- a/arch/arm/boot/dts/am43x-epos-evm.dts
-+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
-@@ -725,7 +725,7 @@
-       pinctrl-0 = <&display_mux_pins>;
-       status = "okay";
- 
--      p1 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
--- 
-2.30.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 1a3735d8e230f37b5dc8deaf500aa7b98edff874..059f897006bab162f73f3dab60ac2a310add1cd8 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-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
 arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch

diff --git a/queue-5.13/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch b/queue-5.13/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index fcc4c7b..0000000
--- a/queue-5.13/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4504a77ba07834a5f2765574adc614eea46b4b4d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:55 +0300
-Subject: ARM: dts: am437x: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
-
-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/am437x-gp-evm.dts  | 4 ++--
- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
-index 6e4d05d649e9..45cbc7fb557a 100644
---- a/arch/arm/boot/dts/am437x-gp-evm.dts
-+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
-@@ -786,7 +786,7 @@
-       pinctrl-0 = <&gpio0_pins>;
-       status = "okay";
- 
--      p23 {
-+      sel-emmc-nand-hog {
-               gpio-hog;
-               gpios = <23 GPIO_ACTIVE_HIGH>;
-               /* SelEMMCorNAND selects between eMMC and NAND:
-@@ -819,7 +819,7 @@
-       status = "okay";
-       ti,no-reset-on-init;
- 
--      p8 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
-diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
-index 8b696107eef8..aae0af10a5b1 100644
---- a/arch/arm/boot/dts/am43x-epos-evm.dts
-+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
-@@ -725,7 +725,7 @@
-       pinctrl-0 = <&display_mux_pins>;
-       status = "okay";
- 
--      p1 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
--- 
-2.30.2
-

diff --git a/queue-5.13/series b/queue-5.13/series
index 9d793b5e4201b87b053602e9415fc504f4fc4f91..fe3ff9ffaefc1a662d06f39bd3c677da3b9dfd9d 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-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
 arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch

diff --git a/queue-5.4/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch b/queue-5.4/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
deleted file mode 100644 (file)
index a45a994..0000000
--- a/queue-5.4/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5fb6aa79fb3a40ee9ca6d244aa30017860748e4c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 May 2021 20:58:55 +0300
-Subject: ARM: dts: am437x: align gpio hog names with dt-schema
-
-From: Grygorii Strashko <grygorii.strashko@ti.com>
-
-[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
-
-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/am437x-gp-evm.dts  | 4 ++--
- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
-index 811c8cae315b..acc4c2760f46 100644
---- a/arch/arm/boot/dts/am437x-gp-evm.dts
-+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
-@@ -802,7 +802,7 @@
-       pinctrl-0 = <&gpio0_pins>;
-       status = "okay";
- 
--      p23 {
-+      sel-emmc-nand-hog {
-               gpio-hog;
-               gpios = <23 GPIO_ACTIVE_HIGH>;
-               /* SelEMMCorNAND selects between eMMC and NAND:
-@@ -835,7 +835,7 @@
-       status = "okay";
-       ti,no-reset-on-init;
- 
--      p8 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
-diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
-index a9f191d78b54..8a565d3f6824 100644
---- a/arch/arm/boot/dts/am43x-epos-evm.dts
-+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
-@@ -717,7 +717,7 @@
-       pinctrl-0 = <&display_mux_pins>;
-       status = "okay";
- 
--      p1 {
-+      sel-lcd-hdmi-hog {
-               /*
-                * SelLCDorHDMI selects between display and audio paths:
-                * Low: HDMI display with audio via HDMI
--- 
-2.30.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index cc09b273648dc8e5ad7b6b21675f7e67fd163035..551f9f0120d59c2b573d5631e4abcfdf436cb3ba 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-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
 arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch