leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: host: ohci-platform: add platform specific power callback

Browse Source 
This patch enables to call platform specific power callback function.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kuninori Morimoto 2012-08-06 18:09:10 -07:00 committed by Greg Kroah-Hartman
parent 04216bedaf
commit e4d37aeb37
2 changed files with 42 additions and 2 deletions
drivers/usb/host
ohci-platform.c
include/linux/usb
ohci_pdriver.h

36
drivers/usb/host/ohci-platform.c
View File

@ -107,10 +107,18 @@ static int __devinit ohci_platform_probe(struct platform_device *dev)
return -ENXIO; return -ENXIO;
} }
if (pdata->power_on) {
err = pdata->power_on(dev);
if (err < 0)
return err;
}
hcd = usb_create_hcd(&ohci_platform_hc_driver, &dev->dev, hcd = usb_create_hcd(&ohci_platform_hc_driver, &dev->dev,
dev_name(&dev->dev)); dev_name(&dev->dev));
if (!hcd) if (!hcd) {
return -ENOMEM; err = -ENOMEM;
goto err_power;
}
hcd->rsrc_start = res_mem->start; hcd->rsrc_start = res_mem->start;
hcd->rsrc_len = resource_size(res_mem); hcd->rsrc_len = resource_size(res_mem);
@ -138,12 +146,17 @@ err_release_region:
release_mem_region(hcd->rsrc_start, hcd->rsrc_len); release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
err_put_hcd: err_put_hcd:
usb_put_hcd(hcd); usb_put_hcd(hcd);
err_power:
if (pdata->power_off)
pdata->power_off(dev);
return err; return err;
} }
static int __devexit ohci_platform_remove(struct platform_device *dev) static int __devexit ohci_platform_remove(struct platform_device *dev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_hcd *hcd = platform_get_drvdata(dev);
struct usb_ohci_pdata *pdata = dev->dev.platform_data;
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
iounmap(hcd->regs); iounmap(hcd->regs);
@ -151,6 +164,9 @@ static int __devexit ohci_platform_remove(struct platform_device *dev)
usb_put_hcd(hcd); usb_put_hcd(hcd);
platform_set_drvdata(dev, NULL); platform_set_drvdata(dev, NULL);
if (pdata->power_off)
pdata->power_off(dev);
return 0; return 0;
} }
@ -158,12 +174,28 @@ static int __devexit ohci_platform_remove(struct platform_device *dev)
static int ohci_platform_suspend(struct device *dev) static int ohci_platform_suspend(struct device *dev)
{ {
struct usb_ohci_pdata *pdata = dev->platform_data;
struct platform_device *pdev =
container_of(dev, struct platform_device, dev);
if (pdata->power_suspend)
pdata->power_suspend(pdev);
return 0; return 0;
} }
static int ohci_platform_resume(struct device *dev) static int ohci_platform_resume(struct device *dev)
{ {
struct usb_hcd *hcd = dev_get_drvdata(dev); struct usb_hcd *hcd = dev_get_drvdata(dev);
struct usb_ohci_pdata *pdata = dev->platform_data;
struct platform_device *pdev =
container_of(dev, struct platform_device, dev);
if (pdata->power_on) {
int err = pdata->power_on(pdev);
if (err < 0)
return err;
}
ohci_finish_controller_resume(hcd); ohci_finish_controller_resume(hcd);
return 0; return 0;

8
include/linux/usb/ohci_pdriver.h
View File

@ -33,6 +33,14 @@ struct usb_ohci_pdata {
unsigned big_endian_desc:1; unsigned big_endian_desc:1;
unsigned big_endian_mmio:1; unsigned big_endian_mmio:1;
unsigned no_big_frame_no:1; unsigned no_big_frame_no:1;
/* Turn on all power and clocks */
int (*power_on)(struct platform_device *pdev);
/* Turn off all power and clocks */
void (*power_off)(struct platform_device *pdev);
/* Turn on only VBUS suspend power and hotplug detection,
* turn off everything else */
void (*power_suspend)(struct platform_device *pdev);
}; };
#endif /* __USB_CORE_OHCI_PDRIVER_H */ #endif /* __USB_CORE_OHCI_PDRIVER_H */