From 81bc81ec0b902178d7e7790c493fa37e0eab8a0e Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Sat, 12 May 2012 15:31:53 +0900 Subject: [PATCH] --- yaml --- r: 308399 b: refs/heads/master c: 06050e5580aaab667e5f25bc6cb0d554f8683bf0 h: refs/heads/master i: 308397: 591906883e5d94f1bf343e01b4d8eeb850a58a39 308395: 5c14b1a8ab987d5a87b27bd1e2d018a10a71d126 308391: 0af0777df08be12be70a484ed00b4674858c97b5 308383: 5c9a907526ee880b8f2503b051c3aa3f8cfc0cd7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/clock-exynos4212.c | 10 ++++++++++ trunk/arch/arm/mach-exynos/include/mach/map.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 81c5d0810ea5..0cb30ebb390a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad28536a898fbdc8c57d64348e310e1bda776963 +refs/heads/master: 06050e5580aaab667e5f25bc6cb0d554f8683bf0 diff --git a/trunk/arch/arm/mach-exynos/clock-exynos4212.c b/trunk/arch/arm/mach-exynos/clock-exynos4212.c index 98823120570e..da397d21bbcf 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos4212.c +++ b/trunk/arch/arm/mach-exynos/clock-exynos4212.c @@ -92,6 +92,16 @@ static struct clk init_clocks_off[] = { .devname = SYSMMU_CLOCK_DEVNAME(isp, 9), .enable = exynos4212_clk_ip_isp1_ctrl, .ctrlbit = (1 << 4), + }, { + .name = "flite", + .devname = "exynos-fimc-lite.0", + .enable = exynos4212_clk_ip_isp0_ctrl, + .ctrlbit = (1 << 4), + }, { + .name = "flite", + .devname = "exynos-fimc-lite.1", + .enable = exynos4212_clk_ip_isp0_ctrl, + .ctrlbit = (1 << 3), } }; diff --git a/trunk/arch/arm/mach-exynos/include/mach/map.h b/trunk/arch/arm/mach-exynos/include/mach/map.h index 0e2292d04550..d30643ba2739 100644 --- a/trunk/arch/arm/mach-exynos/include/mach/map.h +++ b/trunk/arch/arm/mach-exynos/include/mach/map.h @@ -34,6 +34,9 @@ #define EXYNOS4_PA_JPEG 0x11840000 +/* x = 0...1 */ +#define EXYNOS4_PA_FIMC_LITE(x) (0x12390000 + ((x) * 0x10000)) + #define EXYNOS4_PA_G2D 0x12800000 #define EXYNOS4_PA_I2S0 0x03830000