diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 20:52:05 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 20:52:05 -0500 |
| commit | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (patch) | |
| tree | fa15cd1b385898f01ead4649712f6e4fbcd055cd /arch/arm/plat-s5p | |
| parent | 0ae9a22b45b9e9d0f6058e5257b2daf48036dd35 (diff) | |
| parent | fa353e9f409340cefc7650854065cbcea85c347d (diff) | |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h
Diffstat (limited to 'arch/arm/plat-s5p')
| -rw-r--r-- | arch/arm/plat-s5p/include/plat/map-s5p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h index fef353d44513..d973d39666a3 100644 --- a/arch/arm/plat-s5p/include/plat/map-s5p.h +++ b/arch/arm/plat-s5p/include/plat/map-s5p.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #define S5P_VA_CHIPID S3C_ADDR(0x02000000) | 16 | #define S5P_VA_CHIPID S3C_ADDR(0x02000000) |
| 17 | #define S5P_VA_CMU S3C_ADDR(0x02100000) | 17 | #define S5P_VA_CMU S3C_ADDR(0x02100000) |
| 18 | #define S5P_VA_PMU S3C_ADDR(0x02180000) | ||
| 18 | #define S5P_VA_GPIO S3C_ADDR(0x02200000) | 19 | #define S5P_VA_GPIO S3C_ADDR(0x02200000) |
| 19 | #define S5P_VA_GPIO1 S5P_VA_GPIO | 20 | #define S5P_VA_GPIO1 S5P_VA_GPIO |
| 20 | #define S5P_VA_GPIO2 S3C_ADDR(0x02240000) | 21 | #define S5P_VA_GPIO2 S3C_ADDR(0x02240000) |