diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-03-21 02:14:30 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-03-21 02:14:39 +0900 |
| commit | cbf08b9ebdfc75bb13ef80ad3b8e3bea46d8c43a (patch) | |
| tree | 225319584ce03c06e11fd3f67553124d73666879 /arch/arm/mach-exynos/regs-pmu.h | |
| parent | 6eb84669cf7e94214593f162d4c1cf20424dd906 (diff) | |
| download | blackbird-op-linux-cbf08b9ebdfc75bb13ef80ad3b8e3bea46d8c43a.tar.gz blackbird-op-linux-cbf08b9ebdfc75bb13ef80ad3b8e3bea46d8c43a.zip | |
ARM: EXYNOS: Consolidate exynos4 and exynos5 machine files
Since there is very little difference between these two files,
they can be easily combined into one with necessary SoC checks.
While at it also merge the common.c file into this as it does
not have any other users.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/regs-pmu.h')
| -rw-r--r-- | arch/arm/mach-exynos/regs-pmu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h index 7c029ce27711..58e3fc4d6b5a 100644 --- a/arch/arm/mach-exynos/regs-pmu.h +++ b/arch/arm/mach-exynos/regs-pmu.h @@ -26,7 +26,6 @@ #define S5P_USE_STANDBY_WFI0 (1 << 16) #define S5P_USE_STANDBY_WFE0 (1 << 24) -#define S5P_SWRESET S5P_PMUREG(0x0400) #define EXYNOS_SWRESET S5P_PMUREG(0x0400) #define EXYNOS5440_SWRESET S5P_PMUREG(0x00C4) |
