Drop arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch

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

diff --git a/queue-4.14/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch b/queue-4.14/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
deleted file mode 100644 (file)
index b27ced4..0000000
--- a/queue-4.14/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 3117adbaa626263e39fa2c9e504cd7eeae95b4c4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 May 2021 09:54:06 +0200
-Subject: ARM: dts: dra7x-evm: Align GPIO hog names with dt-schema
-
-From: Geert Uytterhoeven <geert+renesas@glider.be>
-
-[ Upstream commit 0c149400c2f676e7b4cc68e517db29005a7a38c7 ]
-
-The dt-schema for nxp,pcf8575 expects GPIO hogs node names to end with a
-'hog' suffix.
-
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/dra7-evm.dts          | 2 +-
- arch/arm/boot/dts/dra71-evm.dts         | 2 +-
- arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +-
- arch/arm/boot/dts/dra76-evm.dts         | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
-index aa426dabb6c3..c3990325f7e6 100644
---- a/arch/arm/boot/dts/dra7-evm.dts
-+++ b/arch/arm/boot/dts/dra7-evm.dts
-@@ -315,7 +315,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
-index 64363f75c01a..cf1db1b71bab 100644
---- a/arch/arm/boot/dts/dra71-evm.dts
-+++ b/arch/arm/boot/dts/dra71-evm.dts
-@@ -160,7 +160,7 @@
- };
- 
- &pcf_hdmi {
--      p0 {
-+      hdmi-i2c-disable-hog {
-               /*
-                * PM_OEn to High: Disable routing I2C3 to PM_I2C
-                * With this PM_SEL(p3) should not matter
-diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
-index 2e485a13dfd7..a5e65c1a568e 100644
---- a/arch/arm/boot/dts/dra72-evm-common.dtsi
-+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
-@@ -272,7 +272,7 @@
-                */
-               lines-initial-states = <0x0f2b>;
- 
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
-index f64aab450315..51ff6321199d 100644
---- a/arch/arm/boot/dts/dra76-evm.dts
-+++ b/arch/arm/boot/dts/dra76-evm.dts
-@@ -314,7 +314,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
--- 
-2.30.2
-

diff --git a/queue-4.14/series b/queue-4.14/series
index d820ca5c6ef424e175fca41875d07869426304fb..bae23c16e598ef9f5209593f59b51a33813db718 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -12,7 +12,6 @@ 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-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
 arm64-dts-juno-update-scpi-nodes-as-per-the-yaml-sch.patch
 arm64-dts-ls208xa-remove-bus-num-from-dspi-node.patch

diff --git a/queue-4.19/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch b/queue-4.19/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
deleted file mode 100644 (file)
index 5b1b763..0000000
--- a/queue-4.19/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 725565efec7b0d70f1f7bc3b22cff1b2bbc57c4a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 May 2021 09:54:06 +0200
-Subject: ARM: dts: dra7x-evm: Align GPIO hog names with dt-schema
-
-From: Geert Uytterhoeven <geert+renesas@glider.be>
-
-[ Upstream commit 0c149400c2f676e7b4cc68e517db29005a7a38c7 ]
-
-The dt-schema for nxp,pcf8575 expects GPIO hogs node names to end with a
-'hog' suffix.
-
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/dra7-evm.dts          | 2 +-
- arch/arm/boot/dts/dra71-evm.dts         | 2 +-
- arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +-
- arch/arm/boot/dts/dra76-evm.dts         | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
-index 6ed5f9156270..1b7f1c7921de 100644
---- a/arch/arm/boot/dts/dra7-evm.dts
-+++ b/arch/arm/boot/dts/dra7-evm.dts
-@@ -335,7 +335,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
-index c471bf3277b4..60ce286edf03 100644
---- a/arch/arm/boot/dts/dra71-evm.dts
-+++ b/arch/arm/boot/dts/dra71-evm.dts
-@@ -161,7 +161,7 @@
- };
- 
- &pcf_hdmi {
--      p0 {
-+      hdmi-i2c-disable-hog {
-               /*
-                * PM_OEn to High: Disable routing I2C3 to PM_I2C
-                * With this PM_SEL(p3) should not matter
-diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
-index e297b923b71a..b33221747ac3 100644
---- a/arch/arm/boot/dts/dra72-evm-common.dtsi
-+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
-@@ -264,7 +264,7 @@
-                */
-               lines-initial-states = <0x0f2b>;
- 
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
-index 5a46163d465f..08f414db95aa 100644
---- a/arch/arm/boot/dts/dra76-evm.dts
-+++ b/arch/arm/boot/dts/dra76-evm.dts
-@@ -295,7 +295,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
--- 
-2.30.2
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 675a5a195ec4db133e48fa3940fd007de1afa261..dc6743a6ed116e5a50007f1d0e1ab681866579e6 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -16,7 +16,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
 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
 arm-dts-stm32-fix-rcc-node-name-on-stm32f429-mcu.patch
 arm-dts-stm32-fix-timer-nodes-on-stm32-mcu-to-preven.patch

diff --git a/queue-5.10/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch b/queue-5.10/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
deleted file mode 100644 (file)
index f496ac7..0000000
--- a/queue-5.10/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From bd6d2f70e901dbe7a9a1ae1f9f7cd3ffd4f6fb6b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 May 2021 09:54:06 +0200
-Subject: ARM: dts: dra7x-evm: Align GPIO hog names with dt-schema
-
-From: Geert Uytterhoeven <geert+renesas@glider.be>
-
-[ Upstream commit 0c149400c2f676e7b4cc68e517db29005a7a38c7 ]
-
-The dt-schema for nxp,pcf8575 expects GPIO hogs node names to end with a
-'hog' suffix.
-
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/dra7-evm.dts          | 2 +-
- arch/arm/boot/dts/dra71-evm.dts         | 2 +-
- arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +-
- arch/arm/boot/dts/dra76-evm.dts         | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
-index 38530dbb89a0..3dcb6e1f49bc 100644
---- a/arch/arm/boot/dts/dra7-evm.dts
-+++ b/arch/arm/boot/dts/dra7-evm.dts
-@@ -366,7 +366,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
-index cad58f733bd6..6f24c38131be 100644
---- a/arch/arm/boot/dts/dra71-evm.dts
-+++ b/arch/arm/boot/dts/dra71-evm.dts
-@@ -185,7 +185,7 @@
- };
- 
- &pcf_hdmi {
--      p0 {
-+      hdmi-i2c-disable-hog {
-               /*
-                * PM_OEn to High: Disable routing I2C3 to PM_I2C
-                * With this PM_SEL(p3) should not matter
-diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
-index b65b2dd094d0..f2384277d5dc 100644
---- a/arch/arm/boot/dts/dra72-evm-common.dtsi
-+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
-@@ -268,7 +268,7 @@
-                */
-               lines-initial-states = <0x0f2b>;
- 
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
-index 9bd01ae40b1d..df47ea59c9c4 100644
---- a/arch/arm/boot/dts/dra76-evm.dts
-+++ b/arch/arm/boot/dts/dra76-evm.dts
-@@ -381,7 +381,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
--- 
-2.30.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 059f897006bab162f73f3dab60ac2a310add1cd8..21ecebe26174ed97c6e1b54f9f8c432ec09b45dd 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -31,7 +31,6 @@ 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-dra7x-evm-align-gpio-hog-names-with-dt-schem.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
 arm-dts-am335x-fix-ti-no-reset-on-init-flag-for-gpio.patch

diff --git a/queue-5.13/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch b/queue-5.13/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
deleted file mode 100644 (file)
index f16e88a..0000000
--- a/queue-5.13/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 37a2834931ba79ce06f82a7e8d54f9205fbefe24 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 May 2021 09:54:06 +0200
-Subject: ARM: dts: dra7x-evm: Align GPIO hog names with dt-schema
-
-From: Geert Uytterhoeven <geert+renesas@glider.be>
-
-[ Upstream commit 0c149400c2f676e7b4cc68e517db29005a7a38c7 ]
-
-The dt-schema for nxp,pcf8575 expects GPIO hogs node names to end with a
-'hog' suffix.
-
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/dra7-evm.dts          | 2 +-
- arch/arm/boot/dts/dra71-evm.dts         | 2 +-
- arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +-
- arch/arm/boot/dts/dra76-evm.dts         | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
-index 38530dbb89a0..3dcb6e1f49bc 100644
---- a/arch/arm/boot/dts/dra7-evm.dts
-+++ b/arch/arm/boot/dts/dra7-evm.dts
-@@ -366,7 +366,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
-index 6d2cca6b4488..a64364443031 100644
---- a/arch/arm/boot/dts/dra71-evm.dts
-+++ b/arch/arm/boot/dts/dra71-evm.dts
-@@ -187,7 +187,7 @@
- };
- 
- &pcf_hdmi {
--      p0 {
-+      hdmi-i2c-disable-hog {
-               /*
-                * PM_OEn to High: Disable routing I2C3 to PM_I2C
-                * With this PM_SEL(p3) should not matter
-diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
-index b65b2dd094d0..f2384277d5dc 100644
---- a/arch/arm/boot/dts/dra72-evm-common.dtsi
-+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
-@@ -268,7 +268,7 @@
-                */
-               lines-initial-states = <0x0f2b>;
- 
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
-index 9bd01ae40b1d..df47ea59c9c4 100644
---- a/arch/arm/boot/dts/dra76-evm.dts
-+++ b/arch/arm/boot/dts/dra76-evm.dts
-@@ -381,7 +381,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
--- 
-2.30.2
-

diff --git a/queue-5.13/series b/queue-5.13/series
index fe3ff9ffaefc1a662d06f39bd3c677da3b9dfd9d..7cc742562251591a0576cdc717d854cb27b91374 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -38,7 +38,6 @@ 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-dra7x-evm-align-gpio-hog-names-with-dt-schem.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
 arm-dts-am335x-fix-ti-no-reset-on-init-flag-for-gpio.patch

diff --git a/queue-5.4/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch b/queue-5.4/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
deleted file mode 100644 (file)
index 554332a..0000000
--- a/queue-5.4/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From ff4a7f89f4c26b207423a99b5c6ad33525bc783e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 May 2021 09:54:06 +0200
-Subject: ARM: dts: dra7x-evm: Align GPIO hog names with dt-schema
-
-From: Geert Uytterhoeven <geert+renesas@glider.be>
-
-[ Upstream commit 0c149400c2f676e7b4cc68e517db29005a7a38c7 ]
-
-The dt-schema for nxp,pcf8575 expects GPIO hogs node names to end with a
-'hog' suffix.
-
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/dra7-evm.dts          | 2 +-
- arch/arm/boot/dts/dra71-evm.dts         | 2 +-
- arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +-
- arch/arm/boot/dts/dra76-evm.dts         | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
-index de7f85efaa51..498ccb46bca8 100644
---- a/arch/arm/boot/dts/dra7-evm.dts
-+++ b/arch/arm/boot/dts/dra7-evm.dts
-@@ -332,7 +332,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
-index fabeb7704753..88178a64b04f 100644
---- a/arch/arm/boot/dts/dra71-evm.dts
-+++ b/arch/arm/boot/dts/dra71-evm.dts
-@@ -158,7 +158,7 @@
- };
- 
- &pcf_hdmi {
--      p0 {
-+      hdmi-i2c-disable-hog {
-               /*
-                * PM_OEn to High: Disable routing I2C3 to PM_I2C
-                * With this PM_SEL(p3) should not matter
-diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
-index 8641a3d7d8ad..3638e0cefe38 100644
---- a/arch/arm/boot/dts/dra72-evm-common.dtsi
-+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
-@@ -261,7 +261,7 @@
-                */
-               lines-initial-states = <0x0f2b>;
- 
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
-diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
-index 1fb6f13fb5e2..9bcb91841a02 100644
---- a/arch/arm/boot/dts/dra76-evm.dts
-+++ b/arch/arm/boot/dts/dra76-evm.dts
-@@ -292,7 +292,7 @@
-               reg = <0x26>;
-               gpio-controller;
-               #gpio-cells = <2>;
--              p1 {
-+              hdmi-audio-hog {
-                       /* vin6_sel_s0: high: VIN6, low: audio */
-                       gpio-hog;
-                       gpios = <1 GPIO_ACTIVE_HIGH>;
--- 
-2.30.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 551f9f0120d59c2b573d5631e4abcfdf436cb3ba..10ef89bf3730982722e1dd5536bca95b79e8bbd3 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -21,7 +21,6 @@ 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-dra7x-evm-align-gpio-hog-names-with-dt-schem.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
 arm-dts-stm32-fix-gpio-keys-node-on-stm32-mcu-boards.patch