ARM: S5PV310: Fix build error on GPIO map
This patch fixes build error about GPIO address due to conflict of commit4d914705
and19a2c065
. - 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:
parent
138a6c7f4f
commit
fe0cdec8ba
|
@ -57,7 +57,7 @@ static struct map_desc s5pv310_iodesc[] __initdata = {
|
|||
.type = MT_DEVICE,
|
||||
}, {
|
||||
.virtual = (unsigned long)S5P_VA_GPIO,
|
||||
.pfn = __phys_to_pfn(S5PV310_PA_GPIO),
|
||||
.pfn = __phys_to_pfn(S5PV310_PA_GPIO1),
|
||||
.length = SZ_4K,
|
||||
.type = MT_DEVICE,
|
||||
}, {
|
||||
|
|
|
@ -52,7 +52,6 @@
|
|||
#define S5PV310_PA_GPIO1 (0x11400000)
|
||||
#define S5PV310_PA_GPIO2 (0x11000000)
|
||||
#define S5PV310_PA_GPIO3 (0x03860000)
|
||||
#define S5P_PA_GPIO S5PV310_PA_GPIO1
|
||||
|
||||
#define S5PV310_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000))
|
||||
|
||||
|
|
Loading…
Reference in New Issue