diff options
| author | Wolfgang Denk | 2011-12-17 20:51:16 +0100 |
|---|---|---|
| committer | Wolfgang Denk | 2011-12-17 20:51:16 +0100 |
| commit | 8b0affecb98f91142015ccf8c43653e1ad87c156 (patch) | |
| tree | c8845c9e4ceef07fb7946326f137ad615f8acf9b /arch | |
| parent | 509adc8b77f885e946449ed62191fbef7fe67b56 (diff) | |
| parent | b2fb47f1873ae812ce33129996a22b11a36d0aa9 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
* 'master' of git://git.denx.de/u-boot-usb:
USB: Use (get|put)_unaligned for accessing wMaxPacketSize
usb:gadget:s5p Enable the USB Gadget framework at Exynos4210 (C210 Universal)
README: add documentation for CONFIG_USB_ULPI*
USB: ULPI: increase error case verbosity
USB: ULPI: clean a mixup of return types
USB: ULPI: switch argument type from u8 to unsigned
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-exynos/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index 4464d2715c1..6d97b99548b 100644 --- a/arch/arm/include/asm/arch-exynos/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -46,6 +46,7 @@ #define EXYNOS4_ADC_BASE 0x13910000 #define EXYNOS4_PWMTIMER_BASE 0x139D0000 #define EXYNOS4_MODEM_BASE 0x13A00000 +#define EXYNOS4_USBPHY_CONTROL 0x10020704 #ifndef __ASSEMBLY__ #include <asm/io.h> |