|
@@ -278,22 +278,6 @@ static struct omap_usb_config h4_usb_config __initdata = {
|
|
|
.pins[1] = 4,
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_MACH_OMAP_H4_OTG
|
|
|
- /* S1.10 ON -- USB OTG port
|
|
|
- * usb0 switched to Mini-AB port and isp1301 transceiver;
|
|
|
- * S2.POS3 = OFF, S2.POS4 = ON ... to allow battery charging
|
|
|
- */
|
|
|
- .otg = 1,
|
|
|
- .pins[0] = 4,
|
|
|
-#ifdef CONFIG_USB_GADGET_OMAP
|
|
|
- /* use OTG cable, or standard A-to-MiniB */
|
|
|
- .hmc_mode = 0x14, /* 0:dev/otg 1:host 2:disable */
|
|
|
-#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
|
|
|
- /* use OTG cable, or NONSTANDARD (B-to-MiniB) */
|
|
|
- .hmc_mode = 0x11, /* 0:host 1:host 2:disable */
|
|
|
-#endif /* XX */
|
|
|
-
|
|
|
-#else
|
|
|
/* S1.10 OFF -- usb "download port"
|
|
|
* usb0 switched to Mini-B port and isp1105 transceiver;
|
|
|
* S2.POS3 = ON, S2.POS4 = OFF ... to enable battery charging
|
|
@@ -302,7 +286,6 @@ static struct omap_usb_config h4_usb_config __initdata = {
|
|
|
.pins[0] = 3,
|
|
|
/* .hmc_mode = 0x14,*/ /* 0:dev 1:host 2:disable */
|
|
|
.hmc_mode = 0x00, /* 0:dev|otg 1:disable 2:disable */
|
|
|
-#endif
|
|
|
};
|
|
|
|
|
|
static struct omap_board_config_kernel h4_config[] = {
|