diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:53:10 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:53:10 +0000 |
| commit | 009f742bded4cc7c89b901d59452fbfc0eb292c5 (patch) | |
| tree | 9d4205b21fc69ecd5c124f2834d57d5b022dba0a /arch/arm/mach-s3c6400 | |
| parent | f18ea8276bc6b0f8584c442905e9badc2acc8785 (diff) | |
| parent | 92b118f6968ae0788ac659af47b464acd9a754a1 (diff) | |
ARM: Merge next-s3c64xx-updates
Merge branch 'next-s3c64xx-updates' into for-rmk
Conflicts:
arch/arm/plat-s3c/dev-hsmmc2.c
arch/arm/plat-s3c/include/plat/sdhci.h
Diffstat (limited to 'arch/arm/mach-s3c6400')
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/map.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c6400/s3c6400.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index fc8b223bad4..f3b48f841d8 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h @@ -64,6 +64,9 @@ #define S3C64XX_PA_USBHOST (0x74300000) +#define S3C64XX_PA_USB_HSPHY (0x7C100000) +#define S3C64XX_VA_USB_HSPHY S3C_ADDR_CPU(0x00200000) + /* place VICs close together */ #define S3C_VA_VIC0 (S3C_VA_IRQ + 0x00) #define S3C_VA_VIC1 (S3C_VA_IRQ + 0x10000) @@ -79,5 +82,6 @@ #define S3C_PA_FB S3C64XX_PA_FB #define S3C_PA_USBHOST S3C64XX_PA_USBHOST #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG +#define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY #endif /* __ASM_ARCH_6400_MAP_H */ diff --git a/arch/arm/mach-s3c6400/s3c6400.c b/arch/arm/mach-s3c6400/s3c6400.c index b42bdd0f213..d876ee50367 100644 --- a/arch/arm/mach-s3c6400/s3c6400.c +++ b/arch/arm/mach-s3c6400/s3c6400.c @@ -45,6 +45,7 @@ void __init s3c6400_map_io(void) s3c6400_default_sdhci0(); s3c6400_default_sdhci1(); + s3c6400_default_sdhci2(); /* the i2c devices are directly compatible with s3c2440 */ s3c_i2c0_setname("s3c2440-i2c"); |