]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.18-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 Nov 2017 13:32:33 +0000 (14:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 Nov 2017 13:32:33 +0000 (14:32 +0100)
added patches:
revert-arm-dts-imx53-qsb-common-fix-fec-pinmux-config.patch

queue-3.18/revert-arm-dts-imx53-qsb-common-fix-fec-pinmux-config.patch [new file with mode: 0644]
queue-3.18/series

diff --git a/queue-3.18/revert-arm-dts-imx53-qsb-common-fix-fec-pinmux-config.patch b/queue-3.18/revert-arm-dts-imx53-qsb-common-fix-fec-pinmux-config.patch
new file mode 100644 (file)
index 0000000..ec78be7
--- /dev/null
@@ -0,0 +1,54 @@
+From 2cfe61144e9d770ed3e0556257e9dcc469ca14cf Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 16 Nov 2017 14:29:13 +0100
+Subject: Revert "ARM: dts: imx53-qsb-common: fix FEC pinmux config"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 2eb85ef18c6570e8a59643cd8d5a66122461b1fc which is
+commit 8b649e426336d7d4800ff9c82858328f4215ba01 upstream.
+
+Turns out not to be a good idea in the stable kernels for now as Patrick
+writes:
+       As discussed for 4.4 stable queue this patch might break
+       existing machines, if they use a different pinmux configuration
+       with their own bootloader.
+
+Reported-by: Patrick BrĂ¼nn <P.Bruenn@beckhoff.com>
+Cc: Shawn Guo <shawnguo@kernel.org>
+Cc: Sasha Levin <alexander.levin@verizon.com>
+Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
+---
+ arch/arm/boot/dts/imx53-qsb-common.dtsi |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
++++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
+@@ -215,16 +215,16 @@
+               pinctrl_fec: fecgrp {
+                       fsl,pins = <
+-                              MX53_PAD_FEC_MDC__FEC_MDC               0x4
+-                              MX53_PAD_FEC_MDIO__FEC_MDIO             0x1fc
+-                              MX53_PAD_FEC_REF_CLK__FEC_TX_CLK        0x180
+-                              MX53_PAD_FEC_RX_ER__FEC_RX_ER           0x180
+-                              MX53_PAD_FEC_CRS_DV__FEC_RX_DV          0x180
+-                              MX53_PAD_FEC_RXD1__FEC_RDATA_1          0x180
+-                              MX53_PAD_FEC_RXD0__FEC_RDATA_0          0x180
+-                              MX53_PAD_FEC_TX_EN__FEC_TX_EN           0x4
+-                              MX53_PAD_FEC_TXD1__FEC_TDATA_1          0x4
+-                              MX53_PAD_FEC_TXD0__FEC_TDATA_0          0x4
++                              MX53_PAD_FEC_MDC__FEC_MDC               0x80000000
++                              MX53_PAD_FEC_MDIO__FEC_MDIO             0x80000000
++                              MX53_PAD_FEC_REF_CLK__FEC_TX_CLK        0x80000000
++                              MX53_PAD_FEC_RX_ER__FEC_RX_ER           0x80000000
++                              MX53_PAD_FEC_CRS_DV__FEC_RX_DV          0x80000000
++                              MX53_PAD_FEC_RXD1__FEC_RDATA_1          0x80000000
++                              MX53_PAD_FEC_RXD0__FEC_RDATA_0          0x80000000
++                              MX53_PAD_FEC_TX_EN__FEC_TX_EN           0x80000000
++                              MX53_PAD_FEC_TXD1__FEC_TDATA_1          0x80000000
++                              MX53_PAD_FEC_TXD0__FEC_TDATA_0          0x80000000
+                       >;
+               };
index 38264fa377b0017065c9f9bce2ccaa76b0f2694d..404ddd7ff4d11431f21ab60c8322d0aaf1ba4905 100644 (file)
@@ -4,3 +4,4 @@ mac80211-use-constant-time-comparison-with-keys.patch
 mac80211-don-t-compare-tkip-tx-mic-key-in-reinstall-prevention.patch
 usb-usbtest-fix-null-pointer-dereference.patch
 input-ims-psu-check-if-cdc-union-descriptor-is-sane.patch
+revert-arm-dts-imx53-qsb-common-fix-fec-pinmux-config.patch