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

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

diff --git a/queue-5.10/arm-dts-imx6qdl-kontron-samx6i-fix-phy-mode.patch b/queue-5.10/arm-dts-imx6qdl-kontron-samx6i-fix-phy-mode.patch
new file mode 100644 (file)
index 0000000..e6d9287
--- /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
+@@ -260,7 +260,7 @@
+ &fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet>;
+-      phy-mode = "rgmii";
++      phy-connection-type = "rgmii-id";
+       phy-handle = <&ethphy>;
+       mdio {
index 786be194878a495d1a2200728961aeabb56389b5..25885afa67481528d112ff33dd7b4fc3eeeec492 100644 (file)
@@ -349,3 +349,4 @@ nvme-pci-add-apst-quirk-for-lenovo-n60z-laptop.patch
 vdpa-make-use-of-pfn_phys-pfn_up-pfn_down-helper-mac.patch
 vhost-vdpa-switch-to-use-vmf_insert_pfn-in-the-fault.patch
 wifi-cfg80211-restrict-nl80211_attr_txq_quantum-valu.patch
+arm-dts-imx6qdl-kontron-samx6i-fix-phy-mode.patch