diff options
| author | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-13 10:08:55 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-13 10:08:55 +0200 |
| commit | 484889720d1be43848ae122e7a59490b99308969 (patch) | |
| tree | 3dc26044b22d8664b2db13a567cebf6a2eab4626 | |
| parent | c6acdf93b7ceb1dba5b365322bf56e52852082f3 (diff) | |
| parent | 65fbf7c7079616aa43c1c76cff37ff16b9425556 (diff) | |
Merge change Ic6976ee8 into android-tegra-2.6.29
* changes:
tegra usb host: stubbing out ehci_bus suspend/resume
| -rw-r--r-- | drivers/usb/host/ehci-tegra.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index ba167c776652..698e5f7f365e 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -37,16 +37,12 @@ #include "nvrm_hardware_access.h" #include "nvddk_usbphy.h" -/* FIXME: Power Management is un-ported so temporarily disable it */ -#undef CONFIG_PM - #define TEGRA_USB_ID_INT_ENABLE (1 << 0) #define TEGRA_USB_ID_INT_STATUS (1 << 1) #define TEGRA_USB_ID_PIN_STATUS (1 << 2) #define TEGRA_USB_ID_PIN_WAKEUP_ENABLE (1 << 6) #define TEGRA_USB_PHY_WAKEUP_REG_OFFSET (0x408) - static void tegra_ehci_shutdown (struct usb_hcd *hcd) { struct tegra_hcd_platform_data *pdata; @@ -62,7 +58,6 @@ static void tegra_ehci_shutdown (struct usb_hcd *hcd) NV_ASSERT_SUCCESS(NvDdkUsbPhyPowerDown(pdata->hUsbPhy, 0)); } - static irqreturn_t tegra_ehci_irq (struct usb_hcd *hcd) { struct ehci_hcd *ehci = hcd_to_ehci (hcd); @@ -95,7 +90,6 @@ static irqreturn_t tegra_ehci_irq (struct usb_hcd *hcd) return ehci_irq(hcd); } - static int tegra_ehci_reinit(struct usb_hcd *hcd) { struct tegra_hcd_platform_data *pdata; @@ -154,6 +148,18 @@ static int tegra_ehci_setup(struct usb_hcd *hcd) return retval; } +static int tegra_ehci_bus_suspend(struct usb_hcd *hcd) +{ + printk("%s called\n", __func__); + return 0; +} + +static int tegra_ehci_bus_resume(struct usb_hcd *hcd) +{ + printk("%s called\n", __func__); + return 0; +} + static const struct hc_driver tegra_ehci_hc_driver = { .description = hcd_name, .product_desc = "Tegra Ehci host controller", @@ -173,13 +179,12 @@ static const struct hc_driver tegra_ehci_hc_driver = { .get_frame_number = ehci_get_frame, .hub_status_data = ehci_hub_status_data, .hub_control = ehci_hub_control, - .bus_suspend = ehci_bus_suspend, - .bus_resume = ehci_bus_resume, + .bus_suspend = tegra_ehci_bus_suspend, + .bus_resume = tegra_ehci_bus_resume, .relinquish_port = ehci_relinquish_port, .port_handed_over = ehci_port_handed_over, }; - static int tegra_ehci_probe(struct platform_device *pdev) { int instance = pdev->id; @@ -317,20 +322,17 @@ static int tegra_ehci_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM static int tegra_ehci_suspend(struct platform_device *pdev, pm_message_t message) { - return -ENXIO; + printk("%s called\n", __func__); + return 0; } static int tegra_ehci_resume(struct platform_device *pdev) { - return -ENXIO; + printk("%s called\n", __func__); + return 0; } -#else -#define tegra_ehci_resume NULL -#define tegra_ehci_suspend NULL -#endif static struct platform_driver tegra_ehci_driver = { @@ -343,5 +345,3 @@ static struct platform_driver tegra_ehci_driver = .name = "tegra-ehci", } }; - - |