mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
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 55ba20afcc 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
32 lines
898 B
Diff
32 lines
898 B
Diff
From 326714a47233e4a524afa0c8398276fddf0dbd4d Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Thu, 6 Dec 2012 19:59:53 +0100
|
|
Subject: [PATCH 32/36] USB: fix roothub for IFXHCD
|
|
|
|
---
|
|
arch/mips/lantiq/Kconfig | 1 +
|
|
drivers/usb/core/hub.c | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/arch/mips/lantiq/Kconfig
|
|
+++ b/arch/mips/lantiq/Kconfig
|
|
@@ -3,6 +3,7 @@ if LANTIQ
|
|
config SOC_TYPE_XWAY
|
|
bool
|
|
select PINCTRL_XWAY
|
|
+ select USB_ARCH_HAS_HCD
|
|
default n
|
|
|
|
choice
|
|
--- a/drivers/usb/core/hub.c
|
|
+++ b/drivers/usb/core/hub.c
|
|
@@ -4337,7 +4337,7 @@ hub_port_init(struct usb_hub *hub, struc
|
|
udev->ttport = hdev->ttport;
|
|
} else if (udev->speed != USB_SPEED_HIGH
|
|
&& hdev->speed == USB_SPEED_HIGH) {
|
|
- if (!hub->tt.hub) {
|
|
+ if (hdev->parent && !hub->tt.hub) {
|
|
dev_err(&udev->dev, "parent hub has no TT\n");
|
|
retval = -EINVAL;
|
|
goto fail;
|