summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/ccxmx51
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-05-06 09:30:27 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-05-06 09:30:27 +0200
commitbb1bd4d582d8b76508ae6ad1a80fc1cbb1a152aa (patch)
tree90496ed8543aa206f50aaf80a1a4cb8a9e3417b1 /arch/arm/boards/ccxmx51
parente0efc0a9ee3d9a8daf6d79eebd1afafbeebecc32 (diff)
parentb48610f3243d6abbe6a52cf3e979e8984faf00a9 (diff)
downloadbarebox-bb1bd4d582d8b76508ae6ad1a80fc1cbb1a152aa.tar.gz
barebox-bb1bd4d582d8b76508ae6ad1a80fc1cbb1a152aa.tar.xz
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/boards/ccxmx51')
-rw-r--r--arch/arm/boards/ccxmx51/ccxmx51js.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/boards/ccxmx51/ccxmx51js.c b/arch/arm/boards/ccxmx51/ccxmx51js.c
index 8c1d2dcd63..ae31cafedf 100644
--- a/arch/arm/boards/ccxmx51/ccxmx51js.c
+++ b/arch/arm/boards/ccxmx51/ccxmx51js.c
@@ -20,6 +20,8 @@
#include <init.h>
#include <mci.h>
#include <asm/armlinux.h>
+#include <mach/gpio.h>
+#include <mach/generic.h>
#include <mach/imx51-regs.h>
#include <mach/iomux-mx51.h>
#include <mach/devices-imx51.h>
@@ -27,6 +29,8 @@
#include "ccxmx51.h"
+#define CCXMX51JS_USBHOST1_RESET IMX_GPIO_NR(3, 8)
+
static iomux_v3_cfg_t ccxmx51js_pads[] = {
/* SD1 */
MX51_PAD_SD1_CLK__SD1_CLK,
@@ -74,6 +78,11 @@ static struct esdhc_platform_data sdhc3_pdata = {
.caps = MMC_MODE_4BIT | MMC_MODE_8BIT,
};
+static struct imxusb_platformdata ccxmx51js_usbhost1_pdata = {
+ .flags = MXC_EHCI_MODE_ULPI | MXC_EHCI_ITC_NO_THRESHOLD,
+ .mode = IMX_USB_MODE_HOST,
+};
+
static int ccxmx51js_init(void)
{
mxc_iomux_v3_setup_multiple_pads(ccxmx51js_pads, ARRAY_SIZE(ccxmx51js_pads));
@@ -83,6 +92,12 @@ static int ccxmx51js_init(void)
imx51_add_mmc2(&sdhc3_pdata);
}
+ gpio_direction_output(CCXMX51JS_USBHOST1_RESET, 0);
+ mdelay(10);
+ gpio_set_value(CCXMX51JS_USBHOST1_RESET, 1);
+ mdelay(10);
+ imx51_add_usbh1(&ccxmx51js_usbhost1_pdata);
+
armlinux_set_architecture(ccxmx51_id->wless ? MACH_TYPE_CCWMX51JS : MACH_TYPE_CCMX51JS);
return 0;