Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit afe046be983f7da53c4bdcfa9a7689d163f08196

Authored by Florian Fainelli
Committed by Greg Kroah-Hartman
1 parent 7bccfcd2eb
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

MIPS: Loongson 1B: use ehci-platform instead of ehci-ls1x. 

The Loongson 1B EHCI driver does nothing more than what the EHCI platform
driver already does, so use the generic implementation.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 2 changed files with 8 additions and 1 deletions Side-by-side Diff

arch/mips/configs/ls1b_defconfig
Diff comments   View file @ afe046b
... ... @@ -76,6 +76,7 @@
76 76 CONFIG_USB=y
77 77 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
78 78 CONFIG_USB_EHCI_HCD=y
  79 +CONFIG_USB_EHCI_HCD_PLATFORM=y
79 80 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
80 81 CONFIG_USB_STORAGE=m
81 82 CONFIG_USB_SERIAL=m
arch/mips/loongson1/common/platform.c
Diff comments   View file @ afe046b
... ... @@ -13,6 +13,7 @@
13 13 #include <linux/phy.h>
14 14 #include <linux/serial_8250.h>
15 15 #include <linux/stmmac.h>
  16 +#include <linux/usb/ehci_pdriver.h>
16 17 #include <asm-generic/sizes.h>
17 18  
18 19 #include <loongson1.h>
19 20  
20 21  
... ... @@ -107,13 +108,18 @@
107 108 },
108 109 };
109 110  
  111 +static struct usb_ehci_pdata ls1x_ehci_pdata = {
  112 + .port_power_off = 1,
  113 +};
  114 +
110 115 struct platform_device ls1x_ehci_device = {
111   - .name = "ls1x-ehci",
  116 + .name = "ehci-platform",
112 117 .id = -1,
113 118 .num_resources = ARRAY_SIZE(ls1x_ehci_resources),
114 119 .resource = ls1x_ehci_resources,
115 120 .dev = {
116 121 .dma_mask = &ls1x_ehci_dmamask,
  122 + .platform_data = &ls1x_ehci_pdata,
117 123 },
118 124 };
119 125