|
@@ -40,11 +40,6 @@
|
|
|
#include "beagle.h"
|
|
|
#include <command.h>
|
|
|
|
|
|
-#ifdef CONFIG_USB_EHCI_HCD
|
|
|
-#include <usb.h>
|
|
|
-#include <asm/ehci-omap.h>
|
|
|
-#endif
|
|
|
-
|
|
|
#define TWL4030_I2C_BUS 0
|
|
|
#define EXPANSION_EEPROM_I2C_BUS 1
|
|
|
#define EXPANSION_EEPROM_I2C_ADDRESS 0x50
|
|
@@ -297,33 +292,6 @@ static void beagle_dvi_pup(void)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_USB_MUSB_OMAP2PLUS
|
|
|
-static struct musb_hdrc_config musb_config = {
|
|
|
- .multipoint = 1,
|
|
|
- .dyn_fifo = 1,
|
|
|
- .num_eps = 16,
|
|
|
- .ram_bits = 12,
|
|
|
-};
|
|
|
-
|
|
|
-static struct omap_musb_board_data musb_board_data = {
|
|
|
- .interface_type = MUSB_INTERFACE_ULPI,
|
|
|
-};
|
|
|
-
|
|
|
-static struct musb_hdrc_platform_data musb_plat = {
|
|
|
-#if defined(CONFIG_USB_MUSB_HOST)
|
|
|
- .mode = MUSB_HOST,
|
|
|
-#elif defined(CONFIG_USB_MUSB_GADGET)
|
|
|
- .mode = MUSB_PERIPHERAL,
|
|
|
-#else
|
|
|
-#error "Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET"
|
|
|
-#endif
|
|
|
- .config = &musb_config,
|
|
|
- .power = 100,
|
|
|
- .platform_ops = &omap2430_ops,
|
|
|
- .board_data = &musb_board_data,
|
|
|
-};
|
|
|
-#endif
|
|
|
-
|
|
|
/*
|
|
|
* Routine: misc_init_r
|
|
|
* Description: Configure board specific parts
|
|
@@ -506,10 +474,6 @@ int misc_init_r(void)
|
|
|
omap3_dss_enable();
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_USB_MUSB_OMAP2PLUS
|
|
|
- musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE);
|
|
|
-#endif
|
|
|
-
|
|
|
if (generate_fake_mac)
|
|
|
omap_die_id_usbethaddr();
|
|
|
|
|
@@ -548,37 +512,3 @@ void board_mmc_power_init(void)
|
|
|
twl4030_power_mmc_init(0);
|
|
|
}
|
|
|
#endif
|
|
|
-
|
|
|
-#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD)
|
|
|
-/* Call usb_stop() before starting the kernel */
|
|
|
-void show_boot_progress(int val)
|
|
|
-{
|
|
|
- if (val == BOOTSTAGE_ID_RUN_OS)
|
|
|
- usb_stop();
|
|
|
-}
|
|
|
-
|
|
|
-static struct omap_usbhs_board_data usbhs_bdata = {
|
|
|
- .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
|
|
|
- .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
|
|
|
- .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED
|
|
|
-};
|
|
|
-
|
|
|
-int ehci_hcd_init(int index, enum usb_init_type init,
|
|
|
- struct ehci_hccr **hccr, struct ehci_hcor **hcor)
|
|
|
-{
|
|
|
- return omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor);
|
|
|
-}
|
|
|
-
|
|
|
-int ehci_hcd_stop(int index)
|
|
|
-{
|
|
|
- return omap_ehci_hcd_stop();
|
|
|
-}
|
|
|
-
|
|
|
-#endif /* CONFIG_USB_EHCI_HCD */
|
|
|
-
|
|
|
-#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)
|
|
|
-int board_eth_init(bd_t *bis)
|
|
|
-{
|
|
|
- return usb_eth_initialize(bis);
|
|
|
-}
|
|
|
-#endif
|