Merge tag 'v4.0-rc3' into x86/build, to refresh an older tree before applying new...

[cascardo/linux.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 bc89723..e4562b2 100644 (file)
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -82,16 +82,8 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
        musb_plat.mode = board_data->mode;
        musb_plat.extvbus = board_data->extvbus;
 
-       if (soc_is_am35xx()) {
-               oh_name = "am35x_otg_hs";
-               name = "musb-am35x";
-       } else if (cpu_is_ti81xx()) {
-               oh_name = "usb_otg_hs";
-               name = "musb-ti81xx";
-       } else {
-               oh_name = "usb_otg_hs";
-               name = "musb-omap2430";
-       }
+       oh_name = "usb_otg_hs";
+       name = "musb-omap2430";
 
         oh = omap_hwmod_lookup(oh_name);
         if (WARN(!oh, "%s: could not find omap_hwmod for %s\n",