drop queue-5.4/dts-phy-add-gpio-number-and-active-state-used-for-ph.patch

diff --git a/queue-5.4/dts-phy-add-gpio-number-and-active-state-used-for-ph.patch b/queue-5.4/dts-phy-add-gpio-number-and-active-state-used-for-ph.patch
deleted file mode 100644 (file)
index acfc792..0000000
--- a/queue-5.4/dts-phy-add-gpio-number-and-active-state-used-for-ph.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2f3a208bf85b2618f9fb627de6e3460a1dc68b9c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Nov 2020 07:22:11 -0800
-Subject: dts: phy: add GPIO number and active state used for phy reset
-
-From: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
-
-[ Upstream commit a0fa9d727043da2238432471e85de0bdb8a8df65 ]
-
-The GEMGXL_RST line on HiFive Unleashed is pulled low and is
-using GPIO number 12. Add these reset-gpio details to dt-node
-using which the linux phylib can reset the phy.
-
-Signed-off-by: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
-Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
-index cc04e66752aac..1ad3dc2fb6343 100644
---- a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
-+++ b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
-@@ -85,6 +85,7 @@
-       phy0: ethernet-phy@0 {
-               compatible = "ethernet-phy-id0007.0771";
-               reg = <0>;
-+              reset-gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-       };
- };
- 
--- 
-2.27.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index c11f2471a7d4d7bd14d8e8762312e11718102b4d..0ad263f695ed199eb7d7e318b0a01da8f2408b2d 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -30,7 +30,6 @@ arm64-make-atomic-helpers-__always_inline.patch
 xen-fix-event-channel-callback-via-intx-gsi.patch
 x86-xen-add-xen_no_vector_callback-option-to-test-pc.patch
 dts-phy-fix-missing-mdio-device-and-probe-failure-of.patch
-dts-phy-add-gpio-number-and-active-state-used-for-ph.patch
 riscv-defconfig-enable-gpio-support-for-hifive-unlea.patch
 drm-amdgpu-psp-fix-psp-gfx-ctrl-cmds.patch
 drm-amd-display-fix-to-be-able-to-stop-crc-calculati.patch