diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-10 12:51:26 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-10 12:51:26 -0500 |
commit | f7c8faedf98aa5ec372e0191078ac7fe1e7fb067 (patch) | |
tree | 14e69d0e6022e23850611abdc1b48770b921c193 /arch/arm/mach-exynos/include | |
parent | acf346084bca289a00020a5c29c23673b801b380 (diff) | |
parent | 4d2e4d7f2c2b1a4382286821a59fa2f4012cb748 (diff) |
Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
ARM: EXYNOS: add support JPEG
ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
ARM: S5PV210: Add usb otg phy control
ARM: S3C64XX: Add usb otg phy control
ARM: EXYNOS: Enable l2 configuration through device tree
ARM: EXYNOS: remove useless code to save/restore L2
ARM: EXYNOS: save L2 settings during bootup
ARM: S5P: add L2 early resume code
ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable}
ARM: S3C64XX: Define some additional always off clocks
ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode
ARM: SAMSUNG: Add a callback 'notify_after' for PWM backlight control
ARM: SAMSUNG: add G2D to plat-s5p and mach-exynos
ARM: S3C64XX: Gate some more clocks by default
ARM: S3C64XX: Add basic cpuidle driver
Diffstat (limited to 'arch/arm/mach-exynos/include')
-rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-exynos/include/mach/pmu.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index c754a22a2bb3..a8cd65fcc685 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h | |||
@@ -31,6 +31,10 @@ | |||
31 | #define EXYNOS4_PA_FIMC2 0x11820000 | 31 | #define EXYNOS4_PA_FIMC2 0x11820000 |
32 | #define EXYNOS4_PA_FIMC3 0x11830000 | 32 | #define EXYNOS4_PA_FIMC3 0x11830000 |
33 | 33 | ||
34 | #define EXYNOS4_PA_JPEG 0x11840000 | ||
35 | |||
36 | #define EXYNOS4_PA_G2D 0x12800000 | ||
37 | |||
34 | #define EXYNOS4_PA_I2S0 0x03830000 | 38 | #define EXYNOS4_PA_I2S0 0x03830000 |
35 | #define EXYNOS4_PA_I2S1 0xE3100000 | 39 | #define EXYNOS4_PA_I2S1 0xE3100000 |
36 | #define EXYNOS4_PA_I2S2 0xE2A00000 | 40 | #define EXYNOS4_PA_I2S2 0xE2A00000 |
@@ -57,6 +61,7 @@ | |||
57 | #define EXYNOS4_PA_KEYPAD 0x100A0000 | 61 | #define EXYNOS4_PA_KEYPAD 0x100A0000 |
58 | 62 | ||
59 | #define EXYNOS4_PA_DMC0 0x10400000 | 63 | #define EXYNOS4_PA_DMC0 0x10400000 |
64 | #define EXYNOS4_PA_DMC1 0x10410000 | ||
60 | 65 | ||
61 | #define EXYNOS4_PA_COMBINER 0x10440000 | 66 | #define EXYNOS4_PA_COMBINER 0x10440000 |
62 | 67 | ||
@@ -162,6 +167,8 @@ | |||
162 | #define S5P_PA_FIMC1 EXYNOS4_PA_FIMC1 | 167 | #define S5P_PA_FIMC1 EXYNOS4_PA_FIMC1 |
163 | #define S5P_PA_FIMC2 EXYNOS4_PA_FIMC2 | 168 | #define S5P_PA_FIMC2 EXYNOS4_PA_FIMC2 |
164 | #define S5P_PA_FIMC3 EXYNOS4_PA_FIMC3 | 169 | #define S5P_PA_FIMC3 EXYNOS4_PA_FIMC3 |
170 | #define S5P_PA_JPEG EXYNOS4_PA_JPEG | ||
171 | #define S5P_PA_G2D EXYNOS4_PA_G2D | ||
165 | #define S5P_PA_FIMD0 EXYNOS4_PA_FIMD0 | 172 | #define S5P_PA_FIMD0 EXYNOS4_PA_FIMD0 |
166 | #define S5P_PA_HDMI EXYNOS4_PA_HDMI | 173 | #define S5P_PA_HDMI EXYNOS4_PA_HDMI |
167 | #define S5P_PA_IIC_HDMIPHY EXYNOS4_PA_IIC_HDMIPHY | 174 | #define S5P_PA_IIC_HDMIPHY EXYNOS4_PA_IIC_HDMIPHY |
diff --git a/arch/arm/mach-exynos/include/mach/pmu.h b/arch/arm/mach-exynos/include/mach/pmu.h index 632dd5630138..e76b7faba66b 100644 --- a/arch/arm/mach-exynos/include/mach/pmu.h +++ b/arch/arm/mach-exynos/include/mach/pmu.h | |||
@@ -22,11 +22,13 @@ enum sys_powerdown { | |||
22 | NUM_SYS_POWERDOWN, | 22 | NUM_SYS_POWERDOWN, |
23 | }; | 23 | }; |
24 | 24 | ||
25 | extern unsigned long l2x0_regs_phys; | ||
25 | struct exynos4_pmu_conf { | 26 | struct exynos4_pmu_conf { |
26 | void __iomem *reg; | 27 | void __iomem *reg; |
27 | unsigned int val[NUM_SYS_POWERDOWN]; | 28 | unsigned int val[NUM_SYS_POWERDOWN]; |
28 | }; | 29 | }; |
29 | 30 | ||
30 | extern void exynos4_sys_powerdown_conf(enum sys_powerdown mode); | 31 | extern void exynos4_sys_powerdown_conf(enum sys_powerdown mode); |
32 | extern void s3c_cpu_resume(void); | ||
31 | 33 | ||
32 | #endif /* __ASM_ARCH_PMU_H */ | 34 | #endif /* __ASM_ARCH_PMU_H */ |