2 files changed, 42 insertions, 2 deletions

diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index 4c886f938f6..10d85b9d9e9 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -107,10 +107,18 @@ static int __devinit ohci_platform_probe(struct platform_device *dev)
                 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,
                         dev_name(&dev->dev));
-        if (!hcd)
-                return -ENOMEM;
+        if (!hcd) {
+                err = -ENOMEM;
+                goto err_power;
+        }
 
         hcd->rsrc_start = res_mem->start;
         hcd->rsrc_len = resource_size(res_mem);
@@ -138,12 +146,17 @@ err_release_region:
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 err_put_hcd:
         usb_put_hcd(hcd);
+err_power:
+        if (pdata->power_off)
+                pdata->power_off(dev);
+
         return err;
 }
 
 static int __devexit ohci_platform_remove(struct platform_device *dev)
 {
         struct usb_hcd *hcd = platform_get_drvdata(dev);
+        struct usb_ohci_pdata *pdata = dev->dev.platform_data;
 
         usb_remove_hcd(hcd);
         iounmap(hcd->regs);
@@ -151,6 +164,9 @@ static int __devexit ohci_platform_remove(struct platform_device *dev)
         usb_put_hcd(hcd);
         platform_set_drvdata(dev, NULL);
 
+        if (pdata->power_off)
+                pdata->power_off(dev);
+
         return 0;
 }
 
@@ -158,12 +174,28 @@ static int __devexit ohci_platform_remove(struct platform_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;
 }
 
 static int ohci_platform_resume(struct device *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);
         return 0;
diff --git a/include/linux/usb/ohci_pdriver.h b/include/linux/usb/ohci_pdriver.h
index 2808f2a9cce..74e7755168b 100644
--- a/include/linux/usb/ohci_pdriver.h
+++ b/include/linux/usb/ohci_pdriver.h
@@ -33,6 +33,14 @@ struct usb_ohci_pdata {
         unsigned        big_endian_desc:1;
         unsigned        big_endian_mmio: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 */