renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-19 08:05:27 +08:00
Code

ARM: S5PV310: Fix build error on GPIO map

Browse Source 
This patch fixes build error about GPIO address due to
conflict of commit 4d914705 and 19a2c065.

- commit 4d914705: Fix on GPIO base addresses
- commit 19a2c065: Moves initial map for merging S5P64X0

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Kukjin Kim 2010-09-09 21:57:29 +09:00
parent 138a6c7f4f
commit fe0cdec8ba
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s5pv310/cpu.c
View File

@ -57,7 +57,7 @@ static struct map_desc s5pv310_iodesc[] __initdata = {
.type = MT_DEVICE, .type = MT_DEVICE,
}, { }, {
.virtual = (unsigned long)S5P_VA_GPIO, .virtual = (unsigned long)S5P_VA_GPIO,
.pfn = __phys_to_pfn(S5PV310_PA_GPIO), .pfn = __phys_to_pfn(S5PV310_PA_GPIO1),
.length = SZ_4K, .length = SZ_4K,
.type = MT_DEVICE, .type = MT_DEVICE,
}, { }, {

1
arch/arm/mach-s5pv310/include/mach/map.h
View File

@ -52,7 +52,6 @@
#define S5PV310_PA_GPIO1 (0x11400000) #define S5PV310_PA_GPIO1 (0x11400000)
#define S5PV310_PA_GPIO2 (0x11000000) #define S5PV310_PA_GPIO2 (0x11000000)
#define S5PV310_PA_GPIO3 (0x03860000) #define S5PV310_PA_GPIO3 (0x03860000)
#define S5P_PA_GPIO S5PV310_PA_GPIO1
#define S5PV310_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000)) #define S5PV310_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000))