f577cb25c0
The following patches were dropped because they are already applied upstream: - 0038-MIPS-lantiq-fpi-on-ar9.patch - 0039-MIPS-lantiq-initialize-usb-on-boot.patch - 0042-USB-DWC2-big-endian-support.patch - 0043-gpio-stp-xway-fix-phy-mask.patch All other patches were simply refreshed, except the following: - 0001-MIPS-lantiq-add-pcie-driver.patch Changes to arch/mips/lantiq/xway/sysctrl.c (these changes disabled some PMU gates for the vrx200 / VR9 SoCs) were removed since the upstream kernel disables unused PMU gates automatically (since 95135bfa7ead1becc2879230f72583dde2b71a0c "MIPS: Lantiq: Deactivate most of the devices by default"). - 0025-NET-MIPS-lantiq-adds-xrx200-net.patch Since OpenWrt commit 55ba20afcc2fe785146316e5be2c2473cb329885 drivers should use of_get_mac_address(). of_get_mac_address_mtd is not available for drivers anymore since it's called automatically within of_get_mac_address(). - 0028-NET-lantiq-various-etop-fixes.patch Same changes as in 0025-NET-MIPS-lantiq-adds-xrx200-net.patch While refreshing the kernel configuration SPI support had to be moved to config-4.4 because otherwise M25P80 was disabled. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> SVN-Revision: 48307
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From c9f294ff6584782d20b4a766901a9cff7398bb20 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Mon, 4 Jan 2016 22:27:57 +0100
|
|
Subject: [PATCH] pinctrl: lantiq: 2 pins have the wrong mux list
|
|
|
|
The latest vendor SDK contained this patch.
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
drivers/pinctrl/pinctrl-xway.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/pinctrl/pinctrl-xway.c
|
|
+++ b/drivers/pinctrl/pinctrl-xway.c
|
|
@@ -160,10 +160,10 @@ static const struct ltq_mfp_pin xway_mfp
|
|
MFP_XWAY(GPIO41, GPIO, NONE, NONE, NONE),
|
|
MFP_XWAY(GPIO42, GPIO, MDIO, NONE, NONE),
|
|
MFP_XWAY(GPIO43, GPIO, MDIO, NONE, NONE),
|
|
- MFP_XWAY(GPIO44, GPIO, NONE, SIN, GPHY),
|
|
+ MFP_XWAY(GPIO44, GPIO, MII, SIN, GPHY),
|
|
MFP_XWAY(GPIO45, GPIO, NONE, GPHY, SIN),
|
|
MFP_XWAY(GPIO46, GPIO, NONE, NONE, EXIN),
|
|
- MFP_XWAY(GPIO47, GPIO, NONE, GPHY, SIN),
|
|
+ MFP_XWAY(GPIO47, GPIO, MII, GPHY, SIN),
|
|
MFP_XWAY(GPIO48, GPIO, EBU, NONE, NONE),
|
|
MFP_XWAY(GPIO49, GPIO, EBU, NONE, NONE),
|
|
MFP_XWAY(GPIO50, GPIO, NONE, NONE, NONE),
|