diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2010-09-29 09:10:51 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-20 18:54:56 -0400 |
commit | ca1931ca1e87c32f9abaef378c6996b25774cb02 (patch) | |
tree | f436ef6b1bccdbdff7225a8345767c41e8851fba | |
parent | e9dde6f1d96e782616f423bae8b46a85748d7ef0 (diff) |
ARM: S5PV210: Enable USB HSOTG gadget build
Add the necessary definitions and mapping information to enable the
s3c-hsotg gadget to build.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/map.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/regs-sys.h | 19 | ||||
-rw-r--r-- | arch/arm/plat-s5p/include/plat/map-s5p.h | 1 |
4 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index 3347a23074b4..8eb480e201b0 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c | |||
@@ -95,6 +95,11 @@ static struct map_desc s5pv210_iodesc[] __initdata = { | |||
95 | .pfn = __phys_to_pfn(S5PV210_PA_DMC1), | 95 | .pfn = __phys_to_pfn(S5PV210_PA_DMC1), |
96 | .length = SZ_4K, | 96 | .length = SZ_4K, |
97 | .type = MT_DEVICE, | 97 | .type = MT_DEVICE, |
98 | }, { | ||
99 | .virtual = (unsigned long)S3C_VA_USB_HSPHY, | ||
100 | .pfn =__phys_to_pfn(S5PV210_PA_HSPHY), | ||
101 | .length = SZ_4K, | ||
102 | .type = MT_DEVICE, | ||
98 | } | 103 | } |
99 | }; | 104 | }; |
100 | 105 | ||
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index 3e89c22412a3..12a409f964ca 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h | |||
@@ -73,6 +73,9 @@ | |||
73 | 73 | ||
74 | #define S5PV210_PA_HSMMC(x) (0xEB000000 + ((x) * 0x100000)) | 74 | #define S5PV210_PA_HSMMC(x) (0xEB000000 + ((x) * 0x100000)) |
75 | 75 | ||
76 | #define S5PV210_PA_HSOTG (0xEC000000) | ||
77 | #define S5PV210_PA_HSPHY (0xEC100000) | ||
78 | |||
76 | #define S5PV210_PA_VIC0 (0xF2000000) | 79 | #define S5PV210_PA_VIC0 (0xF2000000) |
77 | #define S5PV210_PA_VIC1 (0xF2100000) | 80 | #define S5PV210_PA_VIC1 (0xF2100000) |
78 | #define S5PV210_PA_VIC2 (0xF2200000) | 81 | #define S5PV210_PA_VIC2 (0xF2200000) |
@@ -111,6 +114,7 @@ | |||
111 | #define S3C_PA_FB S5PV210_PA_FB | 114 | #define S3C_PA_FB S5PV210_PA_FB |
112 | #define S3C_PA_RTC S5PV210_PA_RTC | 115 | #define S3C_PA_RTC S5PV210_PA_RTC |
113 | #define S3C_PA_WDT S5PV210_PA_WATCHDOG | 116 | #define S3C_PA_WDT S5PV210_PA_WATCHDOG |
117 | #define S3C_PA_USB_HSOTG S5PV210_PA_HSOTG | ||
114 | #define S5P_PA_FIMC0 S5PV210_PA_FIMC0 | 118 | #define S5P_PA_FIMC0 S5PV210_PA_FIMC0 |
115 | #define S5P_PA_FIMC1 S5PV210_PA_FIMC1 | 119 | #define S5P_PA_FIMC1 S5PV210_PA_FIMC1 |
116 | #define S5P_PA_FIMC2 S5PV210_PA_FIMC2 | 120 | #define S5P_PA_FIMC2 S5PV210_PA_FIMC2 |
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-sys.h b/arch/arm/mach-s5pv210/include/mach/regs-sys.h new file mode 100644 index 000000000000..26691d39d0f4 --- /dev/null +++ b/arch/arm/mach-s5pv210/include/mach/regs-sys.h | |||
@@ -0,0 +1,19 @@ | |||
1 | /* arch/arm/mach-s5pv210/include/mach/regs-sys.h | ||
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com/ | ||
5 | * | ||
6 | * S5PV210 - System registers definitions | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #define S5PV210_USB_PHY_CON (S3C_VA_SYS + 0xE80C) | ||
14 | #define S5PV210_USB_PHY0_EN (1 << 0) | ||
15 | #define S5PV210_USB_PHY1_EN (1 << 1) | ||
16 | |||
17 | /* compatibility defines for s3c-hsotg driver */ | ||
18 | #define S3C64XX_OTHERS S5PV210_USB_PHY_CON | ||
19 | #define S3C64XX_OTHERS_USBMASK S5PV210_USB_PHY0_EN | ||
diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h index 24728947682d..c833f3f21816 100644 --- a/arch/arm/plat-s5p/include/plat/map-s5p.h +++ b/arch/arm/plat-s5p/include/plat/map-s5p.h | |||
@@ -18,6 +18,7 @@ | |||
18 | #define S5P_VA_SYSTIMER S3C_ADDR(0x01200000) | 18 | #define S5P_VA_SYSTIMER S3C_ADDR(0x01200000) |
19 | #define S5P_VA_SROMC S3C_ADDR(0x01100000) | 19 | #define S5P_VA_SROMC S3C_ADDR(0x01100000) |
20 | #define S5P_VA_SYSRAM S3C_ADDR(0x01180000) | 20 | #define S5P_VA_SYSRAM S3C_ADDR(0x01180000) |
21 | #define S3C_VA_USB_HSPHY S3C_ADDR(0x02000000) | ||
21 | #define S5P_VA_DMC0 S3C_ADDR(0x00A00000) | 22 | #define S5P_VA_DMC0 S3C_ADDR(0x00A00000) |
22 | #define S5P_VA_DMC1 S3C_ADDR(0x00A80000) | 23 | #define S5P_VA_DMC1 S3C_ADDR(0x00A80000) |
23 | 24 | ||