From: Greg Kroah-Hartman Date: Thu, 16 Nov 2017 13:32:33 +0000 (+0100) Subject: 3.18-stable patches X-Git-Tag: v3.18.82~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7623666b669cab2ba1dbbf9263c73b547e32dd6;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: revert-arm-dts-imx53-qsb-common-fix-fec-pinmux-config.patch --- 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 index 00000000000..ec78be722a7 --- /dev/null +++ b/queue-3.18/revert-arm-dts-imx53-qsb-common-fix-fec-pinmux-config.patch @@ -0,0 +1,54 @@ +From 2cfe61144e9d770ed3e0556257e9dcc469ca14cf Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +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 +Cc: Shawn Guo +Cc: Sasha Levin +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 + >; + }; + diff --git a/queue-3.18/series b/queue-3.18/series index 38264fa377b..404ddd7ff4d 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -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