]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Aug 2024 13:11:04 +0000 (15:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Aug 2024 13:11:04 +0000 (15:11 +0200)
added patches:
arm-dts-imx6qdl-kontron-samx6i-fix-phy-mode.patch

queue-5.4/arm-dts-imx6qdl-kontron-samx6i-fix-phy-mode.patch [new file with mode: 0644]
queue-5.4/series

diff --git a/queue-5.4/arm-dts-imx6qdl-kontron-samx6i-fix-phy-mode.patch b/queue-5.4/arm-dts-imx6qdl-kontron-samx6i-fix-phy-mode.patch
new file mode 100644 (file)
index 0000000..24ab85f
--- /dev/null
@@ -0,0 +1,32 @@
+From 0df3c7d7a73d75153090637392c0b73a63cdc24a Mon Sep 17 00:00:00 2001
+From: Michael Walle <mwalle@kernel.org>
+Date: Mon, 17 Jun 2024 11:13:29 +0200
+Subject: ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
+
+From: Michael Walle <mwalle@kernel.org>
+
+commit 0df3c7d7a73d75153090637392c0b73a63cdc24a upstream.
+
+The i.MX6 cannot add any RGMII delays. The PHY has to add both the RX
+and TX delays on the RGMII interface. Fix the interface mode. While at
+it, use the new phy-connection-type property name.
+
+Fixes: 5694eed98cca ("ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node")
+Signed-off-by: Michael Walle <mwalle@kernel.org>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi
+@@ -259,7 +259,7 @@
+ &fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet>;
+-      phy-mode = "rgmii";
++      phy-connection-type = "rgmii-id";
+       phy-handle = <&ethphy>;
+       mdio {
index 72b4dd8d5ebf8cde777cbebe4f4cd92a0773e48f..9f0532b6062e42d7599fdd2d9e2323f88664dc89 100644 (file)
@@ -256,3 +256,4 @@ arm64-cpufeature-fix-the-visibility-of-compat-hwcaps.patch
 media-uvcvideo-use-entity-get_cur-in-uvc_ctrl_set.patch
 exec-fix-toctou-between-perm-check-and-set-uid-gid-usage.patch
 nvme-pci-add-apst-quirk-for-lenovo-n60z-laptop.patch
+arm-dts-imx6qdl-kontron-samx6i-fix-phy-mode.patch