diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-03-01 14:49:14 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2013-04-16 13:18:13 +0530 |
| commit | b04d3cd1c49c5192c3a966a615a22c883998feb7 (patch) | |
| tree | 55da82e41efec6f0525a5948734ed1346e052ad3 | |
| parent | 7c41e6b972919d39536ed49941cdd389bf2a4ad2 (diff) | |
ARM: EXYNOS: Add FIMD support to DT machine file
Added auxdata and PA for FIMD.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 71242e6bf0ca..6297df8223d3 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -178,6 +178,7 @@ #define EXYNOS4_PA_MIPI_CSIS1 0x11890000 #define EXYNOS4_PA_FIMD0 0x11C00000 +#define EXYNOS5_PA_FIMD1 0x14400000 #define EXYNOS4_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000)) #define EXYNOS4_PA_DWMCI 0x12550000 diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index de567169ba59..efe8bc88a0fb 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -14,6 +14,7 @@ #include <linux/serial_core.h> #include <linux/memblock.h> #include <linux/io.h> +#include <linux/fb.h> #include <asm/mach/arch.h> #include <mach/map.h> @@ -147,9 +148,19 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { "exynos-ohci", NULL), OF_DEV_AUXDATA("samsung,exynos-ehci", 0x12110000, "s5p-ehci", NULL), + OF_DEV_AUXDATA("samsung,exynos5-fimd", EXYNOS5_PA_FIMD1, + "exynos5-fb.1", NULL), {}, }; +static void __init exynos5_setup_fimd(void) +{ + unsigned int reg; + reg = __raw_readl(S3C_VA_SYS + 0x0214); + reg |= (1 << 15); + __raw_writel(reg, S3C_VA_SYS + 0x0214); +} + static const struct of_dev_auxdata exynos5440_auxdata_lookup[] __initconst = { OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5440_PA_UART0, "exynos4210-uart.0", NULL), @@ -203,6 +214,7 @@ static void __init exynos5_dt_machine_init(void) else if (of_machine_is_compatible("samsung,exynos5440")) of_platform_populate(NULL, of_default_bus_match_table, exynos5440_auxdata_lookup, NULL); + exynos5_setup_fimd(); } static char const *exynos5_dt_compat[] __initdata = { |