|
@@ -95,29 +95,46 @@ static struct sh_timer_config sh_tmu1_platform_data __initdata = {
|
|
|
&sh_tmu##idx##_platform_data, \
|
|
|
sizeof(sh_tmu##idx##_platform_data))
|
|
|
|
|
|
-/* USB */
|
|
|
-static struct usb_phy *phy;
|
|
|
+int r8a7778_usb_phy_power(bool enable)
|
|
|
+{
|
|
|
+ static struct usb_phy *phy = NULL;
|
|
|
+ int ret = 0;
|
|
|
+
|
|
|
+ if (!phy)
|
|
|
+ phy = usb_get_phy(USB_PHY_TYPE_USB2);
|
|
|
+
|
|
|
+ if (IS_ERR(phy)) {
|
|
|
+ pr_err("kernel doesn't have usb phy driver\n");
|
|
|
+ return PTR_ERR(phy);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (enable)
|
|
|
+ ret = usb_phy_init(phy);
|
|
|
+ else
|
|
|
+ usb_phy_shutdown(phy);
|
|
|
|
|
|
+ return ret;
|
|
|
+}
|
|
|
+
|
|
|
+/* USB */
|
|
|
static int usb_power_on(struct platform_device *pdev)
|
|
|
{
|
|
|
- if (IS_ERR(phy))
|
|
|
- return PTR_ERR(phy);
|
|
|
+ int ret = r8a7778_usb_phy_power(true);
|
|
|
+
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
|
|
|
pm_runtime_enable(&pdev->dev);
|
|
|
pm_runtime_get_sync(&pdev->dev);
|
|
|
|
|
|
- usb_phy_init(phy);
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
static void usb_power_off(struct platform_device *pdev)
|
|
|
{
|
|
|
- if (IS_ERR(phy))
|
|
|
+ if (r8a7778_usb_phy_power(false))
|
|
|
return;
|
|
|
|
|
|
- usb_phy_shutdown(phy);
|
|
|
-
|
|
|
pm_runtime_put_sync(&pdev->dev);
|
|
|
pm_runtime_disable(&pdev->dev);
|
|
|
}
|
|
@@ -353,8 +370,6 @@ void __init r8a7778_add_standard_devices(void)
|
|
|
|
|
|
void __init r8a7778_init_late(void)
|
|
|
{
|
|
|
- phy = usb_get_phy(USB_PHY_TYPE_USB2);
|
|
|
-
|
|
|
platform_device_register_full(&ehci_info);
|
|
|
platform_device_register_full(&ohci_info);
|
|
|
}
|