Commit 30aa6458 authored by Tony Lindgren's avatar Tony Lindgren

Fix compile for n770 and omap2 boards

Remove now obsolete TAG_USB and make omap_usb_init() available
for omap2 boards using it like H4 and Apollon.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d4c4969f
No related merge requests found
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <mach/omapfb.h> #include <mach/omapfb.h>
#include <mach/lcd_mipid.h> #include <mach/lcd_mipid.h>
#include <mach/mmc.h> #include <mach/mmc.h>
#include <mach/usb.h>
#define ADS7846_PENDOWN_GPIO 15 #define ADS7846_PENDOWN_GPIO 15
...@@ -233,10 +234,6 @@ static inline void nokia770_mmc_init(void) ...@@ -233,10 +234,6 @@ static inline void nokia770_mmc_init(void)
} }
#endif #endif
static struct omap_board_config_kernel nokia770_config[] __initdata = {
{ OMAP_TAG_USB, NULL },
};
#if defined(CONFIG_OMAP_DSP) #if defined(CONFIG_OMAP_DSP)
/* /*
* audio power control * audio power control
...@@ -374,8 +371,6 @@ static void __init omap_nokia770_init(void) ...@@ -374,8 +371,6 @@ static void __init omap_nokia770_init(void)
platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices)); platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
spi_register_board_info(nokia770_spi_board_info, spi_register_board_info(nokia770_spi_board_info,
ARRAY_SIZE(nokia770_spi_board_info)); ARRAY_SIZE(nokia770_spi_board_info));
omap_board_config = nokia770_config;
omap_board_config_size = ARRAY_SIZE(nokia770_config);
omap_gpio_init(); omap_gpio_init();
omap_serial_init(); omap_serial_init();
omap_register_i2c_bus(1, 100, NULL, 0); omap_register_i2c_bus(1, 100, NULL, 0);
......
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#define UDC_BASE OMAP1_UDC_BASE #define UDC_BASE OMAP1_UDC_BASE
#define OMAP_OHCI_BASE OMAP1_OHCI_BASE #define OMAP_OHCI_BASE OMAP1_OHCI_BASE
void omap_usb_init(struct omap_usb_config *pdata);
#else #else
#define OTG_BASE OMAP2_OTG_BASE #define OTG_BASE OMAP2_OTG_BASE
...@@ -37,6 +35,8 @@ static inline void usb_musb_init(void) ...@@ -37,6 +35,8 @@ static inline void usb_musb_init(void)
} }
#endif #endif
void omap_usb_init(struct omap_usb_config *pdata);
#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE) #if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE)
extern void usb_ehci_init(void); extern void usb_ehci_init(void);
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment