From 30d915170346a04b8a29d261982f48fddad92892 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 8 Oct 2012 15:11:17 +0200
Subject: [PATCH] --- yaml --- r: 338490 b: refs/heads/master c:
 afe046be983f7da53c4bdcfa9a7689d163f08196 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/mips/configs/ls1b_defconfig      | 1 +
 trunk/arch/mips/loongson1/common/platform.c | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index afae82db5b3d..bfb04937a285 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bccfcd2eb09297e0406b38cfac8e1f3001964f3
+refs/heads/master: afe046be983f7da53c4bdcfa9a7689d163f08196
diff --git a/trunk/arch/mips/configs/ls1b_defconfig b/trunk/arch/mips/configs/ls1b_defconfig
index 80cff8bea8e8..7eb75543ca1a 100644
--- a/trunk/arch/mips/configs/ls1b_defconfig
+++ b/trunk/arch/mips/configs/ls1b_defconfig
@@ -76,6 +76,7 @@ CONFIG_HID_GENERIC=m
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 CONFIG_USB_STORAGE=m
 CONFIG_USB_SERIAL=m
diff --git a/trunk/arch/mips/loongson1/common/platform.c b/trunk/arch/mips/loongson1/common/platform.c
index e92d59c4bd78..2874bf224418 100644
--- a/trunk/arch/mips/loongson1/common/platform.c
+++ b/trunk/arch/mips/loongson1/common/platform.c
@@ -13,6 +13,7 @@
 #include <linux/phy.h>
 #include <linux/serial_8250.h>
 #include <linux/stmmac.h>
+#include <linux/usb/ehci_pdriver.h>
 #include <asm-generic/sizes.h>
 
 #include <loongson1.h>
@@ -107,13 +108,18 @@ static struct resource ls1x_ehci_resources[] = {
 	},
 };
 
+static struct usb_ehci_pdata ls1x_ehci_pdata = {
+	.port_power_off	= 1,
+};
+
 struct platform_device ls1x_ehci_device = {
-	.name		= "ls1x-ehci",
+	.name		= "ehci-platform",
 	.id		= -1,
 	.num_resources	= ARRAY_SIZE(ls1x_ehci_resources),
 	.resource	= ls1x_ehci_resources,
 	.dev		= {
 		.dma_mask = &ls1x_ehci_dmamask,
+		.platform_data = &ls1x_ehci_pdata,
 	},
 };