Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[pandora-kernel.git] / arch / arm / mach-omap2 / usb-musb.c

diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 19e4dac..2679750 100644 (file)
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -60,52 +60,6 @@ static struct musb_hdrc_platform_data musb_plat = {
 
 static u64 musb_dmamask = DMA_BIT_MASK(32);
 
-static struct omap_device_pm_latency omap_musb_latency[] = {
-       {
-               .deactivate_func        = omap_device_idle_hwmods,
-               .activate_func          = omap_device_enable_hwmods,
-               .flags                  = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
-       },
-};
-
-static void usb_musb_mux_init(struct omap_musb_board_data *board_data)
-{
-       switch (board_data->interface_type) {
-       case MUSB_INTERFACE_UTMI:
-               omap_mux_init_signal("usba0_otg_dp", OMAP_PIN_INPUT);
-               omap_mux_init_signal("usba0_otg_dm", OMAP_PIN_INPUT);
-               break;
-       case MUSB_INTERFACE_ULPI:
-               omap_mux_init_signal("usba0_ulpiphy_clk",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_stp",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_dir",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_nxt",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_dat0",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_dat1",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_dat2",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_dat3",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_dat4",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_dat5",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_dat6",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usba0_ulpiphy_dat7",
-                                               OMAP_PIN_INPUT_PULLDOWN);
-               break;
-       default:
-               break;
-       }
-}
-
 static struct omap_musb_board_data musb_default_board_data = {
        .interface_type         = MUSB_INTERFACE_ULPI,
        .mode                   = MUSB_OTG,
@@ -115,7 +69,6 @@ static struct omap_musb_board_data musb_default_board_data = {
 void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
 {
        struct omap_hwmod               *oh;
-       struct omap_device              *od;
        struct platform_device          *pdev;
        struct device                   *dev;
        int                             bus_id = -1;
@@ -145,22 +98,19 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
                name = "musb-omap2430";
        }
 
-       oh = omap_hwmod_lookup(oh_name);
-       if (!oh) {
-               pr_err("Could not look up %s\n", oh_name);
-               return;
-       }
+        oh = omap_hwmod_lookup(oh_name);
+        if (WARN(!oh, "%s: could not find omap_hwmod for %s\n",
+                 __func__, oh_name))
+                return;
 
-       od = omap_device_build(name, bus_id, oh, &musb_plat,
-                              sizeof(musb_plat), omap_musb_latency,
-                              ARRAY_SIZE(omap_musb_latency), false);
-       if (IS_ERR(od)) {
+       pdev = omap_device_build(name, bus_id, oh, &musb_plat,
+                              sizeof(musb_plat), NULL, 0, false);
+       if (IS_ERR(pdev)) {
                pr_err("Could not build omap_device for %s %s\n",
                                                name, oh_name);
                return;
        }
 
-       pdev = &od->pdev;
        dev = &pdev->dev;
        get_device(dev);
        dev->dma_mask = &musb_dmamask;