summaryrefslogtreecommitdiff
path: root/board/htkw
diff options
context:
space:
mode:
Diffstat (limited to 'board/htkw')
-rw-r--r--board/htkw/mcx/mcx.c19
-rw-r--r--board/htkw/mcx/mcx.h2
2 files changed, 4 insertions, 17 deletions
diff --git a/board/htkw/mcx/mcx.c b/board/htkw/mcx/mcx.c
index 7c9d34ab842..1f9840c34d0 100644
--- a/board/htkw/mcx/mcx.c
+++ b/board/htkw/mcx/mcx.c
@@ -37,12 +37,12 @@
DECLARE_GLOBAL_DATA_PTR;
-#define HOT_WATER_BUTTON 38
+#define HOT_WATER_BUTTON 42
#ifdef CONFIG_USB_EHCI
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[1] = OMAP_USBHS_PORT_MODE_UNUSED,
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
};
@@ -87,6 +87,7 @@ int board_late_init(void)
return 0;
setenv("bootcmd", "run swupdate");
+
return 0;
}
#endif
@@ -108,17 +109,3 @@ int board_mmc_init(bd_t *bis)
return omap_mmc_init(0, 0, 0);
}
#endif
-
-#ifdef CONFIG_USB_EHCI_OMAP
-#define USB_HOST_PWR_EN 132
-int board_usb_init(void)
-{
- if (gpio_request(USB_HOST_PWR_EN, "USB_HOST_PWR_EN") < 0) {
- puts("Failed to get USB_HOST_PWR_EN pin\n");
- return -ENODEV;
- }
- gpio_direction_output(USB_HOST_PWR_EN, 1);
-
- return 0;
-}
-#endif
diff --git a/board/htkw/mcx/mcx.h b/board/htkw/mcx/mcx.h
index 1003bfddd92..f9601c641fd 100644
--- a/board/htkw/mcx/mcx.h
+++ b/board/htkw/mcx/mcx.h
@@ -96,7 +96,7 @@ const omap3_sysinfo sysinfo = {
MUX_VAL(CP(GPMC_A7), (IEN | PTU | EN | M4)) \
MUX_VAL(CP(GPMC_A8), (IEN | PTU | EN | M4)) \
MUX_VAL(CP(GPMC_A9), (IEN | PTU | EN | M4)) \
- MUX_VAL(CP(GPMC_A10), (IDIS | PTU | DIS | M4)) \
+ MUX_VAL(CP(GPMC_A10), (IEN | PTU | EN | M4)) \
/* GPIO_43 LCD buffer enable */ \
MUX_VAL(CP(GPMC_D0), (IEN | PTU | EN | M0)) \
MUX_VAL(CP(GPMC_D1), (IEN | PTU | EN | M0)) \