OMAP3: mcx: updated to new hardware revision

Some GPIOs differ in the new revision board.
Previous revision are considered obsolete and
they will not anymore supported.

Signed-off-by: Stefano Babic <sbabic@denx.de>

diff --git a/board/htkw/mcx/mcx.c b/board/htkw/mcx/mcx.c
index 7c9d34ab84246b447f89f2b351ccc1581cf846c4..1f9840c34d09305dff1302ab87d7b9c9f68e0d87 100644 (file)
--- 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 1003bfddd929fdd308a18ba34ce1b1315acf2aa7..f9601c641fdce758098ea4212988f925479d8ee8 100644 (file)
--- 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)) \

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index d3061a294c290b1f9ac58b2b4056026f29e72044..96e10599651e0fde9b57b523360ee6a46939f91a 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -115,8 +115,7 @@
 #define CONFIG_USB_ULPI
 #define CONFIG_USB_ULPI_VIEWPORT_OMAP
 /*#define CONFIG_EHCI_DCACHE*/ /* leave it disabled for now */
-#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       154
-#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO       152
+#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       57
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 
 /* commands to include */