diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-06-01 15:09:05 -0700 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-06-01 15:27:53 -0700 |
| commit | 08115a139229ca84adfef4d5983c3c186b9d1c30 (patch) | |
| tree | 6bc3e2f1fe07d5365f982d9be80996f1dc5780f8 /arch/arm/mach-exynos4 | |
| parent | 457d4fe85138c0d313c92ef34ea892c73b0fe2f5 (diff) | |
| download | linux-stable-08115a139229ca84adfef4d5983c3c186b9d1c30.tar.gz linux-stable-08115a139229ca84adfef4d5983c3c186b9d1c30.tar.bz2 linux-stable-08115a139229ca84adfef4d5983c3c186b9d1c30.zip | |
ARM: S5P: Should be S3C_VA_USB_HSPHY instead of S5P_VA_XX
Basically, other S3C SoCs and S5PC100 use 'S3C_VA_USB_HSPHY'
commonly. It should be changed to 'S3C_VA_USB_HSPHY' for common
usage and others. Now happens build error on S5PC100.
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos4')
| -rw-r--r-- | arch/arm/mach-exynos4/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-exynos4/include/mach/regs-usb-phy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos4/cpu.c b/arch/arm/mach-exynos4/cpu.c index 08813a6f66b1..9babe4473e88 100644 --- a/arch/arm/mach-exynos4/cpu.c +++ b/arch/arm/mach-exynos4/cpu.c @@ -98,7 +98,7 @@ static struct map_desc exynos4_iodesc[] __initdata = { .length = SZ_4K, .type = MT_DEVICE, }, { - .virtual = (unsigned long)S5P_VA_USB_HSPHY, + .virtual = (unsigned long)S3C_VA_USB_HSPHY, .pfn = __phys_to_pfn(EXYNOS4_PA_HSPHY), .length = SZ_4K, .type = MT_DEVICE, diff --git a/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h b/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h index 703118d5173c..c337cf3a71bf 100644 --- a/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h +++ b/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h @@ -11,7 +11,7 @@ #ifndef __PLAT_S5P_REGS_USB_PHY_H #define __PLAT_S5P_REGS_USB_PHY_H -#define EXYNOS4_HSOTG_PHYREG(x) ((x) + S5P_VA_USB_HSPHY) +#define EXYNOS4_HSOTG_PHYREG(x) ((x) + S3C_VA_USB_HSPHY) #define EXYNOS4_PHYPWR EXYNOS4_HSOTG_PHYREG(0x00) #define PHY1_HSIC_NORMAL_MASK (0xf << 9) |