From: Greg Kroah-Hartman Date: Mon, 9 Mar 2020 20:35:19 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.4.216~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5782555e3c29f89dbf51e5582a5904dad3e6ff2e;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: arm-dts-ls1021a-restore-mdio-compatible-to-gianfar.patch --- diff --git a/queue-4.9/arm-dts-ls1021a-restore-mdio-compatible-to-gianfar.patch b/queue-4.9/arm-dts-ls1021a-restore-mdio-compatible-to-gianfar.patch new file mode 100644 index 00000000000..b4d438413af --- /dev/null +++ b/queue-4.9/arm-dts-ls1021a-restore-mdio-compatible-to-gianfar.patch @@ -0,0 +1,54 @@ +From 7155c44624d061692b4c13aa8343f119c67d4fc0 Mon Sep 17 00:00:00 2001 +From: Vladimir Oltean +Date: Sun, 26 Jan 2020 21:49:50 +0200 +Subject: ARM: dts: ls1021a: Restore MDIO compatible to gianfar + +From: Vladimir Oltean + +commit 7155c44624d061692b4c13aa8343f119c67d4fc0 upstream. + +The difference between "fsl,etsec2-mdio" and "gianfar" has to do with +the .get_tbipa function, which calculates the address of the TBIPA +register automatically, if not explicitly specified. [ see +drivers/net/ethernet/freescale/fsl_pq_mdio.c ]. On LS1021A, the TBIPA +register is at offset 0x30 within the port register block, which is what +the "gianfar" method of calculating addresses actually does. + +Luckily, the bad "compatible" is inconsequential for ls1021a.dtsi, +because the TBIPA register is explicitly specified via the second "reg" +(<0x0 0x2d10030 0x0 0x4>), so the "get_tbipa" function is dead code. +Nonetheless it's good to restore it to its correct value. + +Background discussion: +https://www.spinics.net/lists/stable/msg361156.html + +Fixes: c7861adbe37f ("ARM: dts: ls1021: Fix SGMII PCS link remaining down after PHY disconnect") +Reported-by: Pavel Machek +Signed-off-by: Vladimir Oltean +Signed-off-by: Shawn Guo +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/ls1021a.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm/boot/dts/ls1021a.dtsi ++++ b/arch/arm/boot/dts/ls1021a.dtsi +@@ -505,7 +505,7 @@ + }; + + mdio0: mdio@2d24000 { +- compatible = "fsl,etsec2-mdio"; ++ compatible = "gianfar"; + device_type = "mdio"; + #address-cells = <1>; + #size-cells = <0>; +@@ -513,7 +513,7 @@ + }; + + mdio1: mdio@2d64000 { +- compatible = "fsl,etsec2-mdio"; ++ compatible = "gianfar"; + device_type = "mdio"; + #address-cells = <1>; + #size-cells = <0>; diff --git a/queue-4.9/series b/queue-4.9/series index 0a7374d43bf..63f4ac95f76 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -74,3 +74,4 @@ vt-selection-push-sel_lock-up.patch x86-pkeys-manually-set-x86_feature_ospke-to-preserve-existing-changes.patch dmaengine-tegra-apb-fix-use-after-free.patch dmaengine-tegra-apb-prevent-race-conditions-of-tasklet-vs-free-list.patch +arm-dts-ls1021a-restore-mdio-compatible-to-gianfar.patch