aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2013-02-13 06:16:25 -0500
committerRoger Quadros <rogerq@ti.com>2013-02-13 06:22:35 -0500
commit9d9c6ae79c5e3452721c5eaebdd793edde9d93df (patch)
treeba3a6a90f83c5fd867eec2e905c19d160cc51415 /drivers/usb
parent7f07863ec60f7d3dbeec5aff881ea074db3925ed (diff)
mfd: omap-usb-host: Consolidate OMAP USB-HS platform data (part 2/3)
Let's have a single platform data structure for the OMAP's High-Speed USB host subsystem instead of having 3 separate ones i.e. one for board data, one for USB Host (UHH) module and one for USB-TLL module. This makes the code much simpler and avoids creating multiple copies of platform data. Signed-off-by: Roger Quadros <rogerq@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> For the ehci-omap.c part: Acked-by: Alan Stern <stern@rowland.harvard.edu>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-omap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index ac17a7c3a0cd..5d954d7b290d 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -107,7 +107,7 @@ static int omap_ehci_init(struct usb_hcd *hcd)
107{ 107{
108 struct ehci_hcd *ehci = hcd_to_ehci(hcd); 108 struct ehci_hcd *ehci = hcd_to_ehci(hcd);
109 int rc; 109 int rc;
110 struct ehci_hcd_omap_platform_data *pdata; 110 struct usbhs_omap_platform_data *pdata;
111 111
112 pdata = hcd->self.controller->platform_data; 112 pdata = hcd->self.controller->platform_data;
113 113
@@ -151,7 +151,7 @@ static int omap_ehci_init(struct usb_hcd *hcd)
151} 151}
152 152
153static void disable_put_regulator( 153static void disable_put_regulator(
154 struct ehci_hcd_omap_platform_data *pdata) 154 struct usbhs_omap_platform_data *pdata)
155{ 155{
156 int i; 156 int i;
157 157
@@ -176,7 +176,7 @@ static void disable_put_regulator(
176static int ehci_hcd_omap_probe(struct platform_device *pdev) 176static int ehci_hcd_omap_probe(struct platform_device *pdev)
177{ 177{
178 struct device *dev = &pdev->dev; 178 struct device *dev = &pdev->dev;
179 struct ehci_hcd_omap_platform_data *pdata = dev->platform_data; 179 struct usbhs_omap_platform_data *pdata = dev->platform_data;
180 struct resource *res; 180 struct resource *res;
181 struct usb_hcd *hcd; 181 struct usb_hcd *hcd;
182 void __iomem *regs; 182 void __iomem *regs;