diff options
| -rw-r--r-- | board/olio/h1/h1.c | 73 | ||||
| -rw-r--r-- | include/configs/omap3_h1.h | 30 |
2 files changed, 0 insertions, 103 deletions
diff --git a/board/olio/h1/h1.c b/board/olio/h1/h1.c index e7ec2d975..e04aa817a 100644 --- a/board/olio/h1/h1.c +++ b/board/olio/h1/h1.c @@ -22,19 +22,10 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/mach-types.h> -#include <asm/omap_musb.h> #include <asm/errno.h> -#include <linux/usb/ch9.h> -#include <linux/usb/gadget.h> -#include <linux/usb/musb.h> #include "h1.h" #include <command.h> -#ifdef CONFIG_USB_EHCI -#include <usb.h> -#include <asm/ehci-omap.h> -#endif - #define TWL4030_I2C_BUS 0 DECLARE_GLOBAL_DATA_PTR; @@ -118,33 +109,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_MUSB_HOST) - .mode = MUSB_HOST, -#elif defined(CONFIG_MUSB_GADGET) - .mode = MUSB_PERIPHERAL, -#else -#error "Please define either CONFIG_MUSB_HOST or CONFIG_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 @@ -189,10 +153,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 - return 0; } @@ -206,36 +166,3 @@ void set_muxconf_regs(void) { MUX_BEAGLE(); } - -#if defined(CONFIG_USB_EHCI) && !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, struct ehci_hccr **hccr, struct ehci_hcor **hcor) -{ - return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor); -} - -int ehci_hcd_stop(int index) -{ - return omap_ehci_hcd_stop(); -} - -#endif /* CONFIG_USB_EHCI */ - -#if defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET) -int board_eth_init(bd_t *bis) -{ - return usb_eth_initialize(bis); -} -#endif diff --git a/include/configs/omap3_h1.h b/include/configs/omap3_h1.h index 68fdbbd09..3334c5219 100644 --- a/include/configs/omap3_h1.h +++ b/include/configs/omap3_h1.h @@ -86,30 +86,6 @@ /* Probe all devices */ #define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}} -/* USB */ -#define CONFIG_MUSB_GADGET -#define CONFIG_USB_MUSB_OMAP2PLUS -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_TWL4030_USB 1 -#define CONFIG_USB_ETHER -#define CONFIG_USB_ETHER_RNDIS - -/* USB EHCI */ -#define CONFIG_CMD_USB -#define CONFIG_USB_EHCI - -#define CONFIG_USB_EHCI_OMAP -#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147 - -#define CONFIG_USB_ULPI -#define CONFIG_USB_ULPI_VIEWPORT_OMAP - -#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_USB_HOST_ETHER -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_ASIX - /* commands to include */ #include <config_cmd_default.h> @@ -118,7 +94,6 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 /* EXT2 Support */ -#define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_FS_GENERIC /* Generic FS support */ #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ @@ -128,12 +103,7 @@ "4m(kernel),-(fs)" #define CONFIG_CMD_I2C /* I2C serial bus support */ -#define CONFIG_USB_STORAGE /* USB storage support */ #define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ -#define CONFIG_CMD_NFS /* NFS support */ -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP #define CONFIG_CMD_SETEXPR /* Evaluate expressions */ #define CONFIG_CMD_GPIO /* Enable gpio command */ |