summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-19 18:04:48 -0400
committerTom Rini <trini@konsulko.com>2015-08-19 18:04:48 -0400
commita5d338b2f24d8e193bfa2b6ee33eb39cff0b4adf (patch)
treed76b05507789305b36c78f478acde37fde1cd994 /arch
parentd1221462fece27ad163dcd0c181a456c73fe2011 (diff)
parent7a1386f96bca550240670fa3461d3a0dc060aa01 (diff)
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/arm926ejs/spear/cpu.c4
-rw-r--r--arch/arm/include/asm/arch-spear/hardware.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 1ce9db7a7d..3037084b29 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -47,8 +47,12 @@ int arch_cpu_init(void)
#if defined(CONFIG_NAND_FSMC)
periph1_clken |= MISC_FSMCENB;
#endif
+#if defined(CONFIG_USB_EHCI_SPEAR)
+ periph1_clken |= PERIPH_USBH1 | PERIPH_USBH2;
+#endif
writel(periph1_clken, &misc_p->periph1_clken);
+
return 0;
}
diff --git a/arch/arm/include/asm/arch-spear/hardware.h b/arch/arm/include/asm/arch-spear/hardware.h
index c6da405cc0..065360ab35 100644
--- a/arch/arm/include/asm/arch-spear/hardware.h
+++ b/arch/arm/include/asm/arch-spear/hardware.h
@@ -11,6 +11,8 @@
#define CONFIG_SYS_USBD_BASE 0xE1100000
#define CONFIG_SYS_PLUG_BASE 0xE1200000
#define CONFIG_SYS_FIFO_BASE 0xE1000800
+#define CONFIG_SYS_UHC0_EHCI_BASE 0xE1800000
+#define CONFIG_SYS_UHC1_EHCI_BASE 0xE2000000
#define CONFIG_SYS_SMI_BASE 0xFC000000
#define CONFIG_SPEAR_SYSCNTLBASE 0xFCA00000
#define CONFIG_SPEAR_TIMERBASE 0xFC800000