From: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Add support for FIMC on Samsung Aquila board. Enable support for local path mode between fimc and frame buffer. Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> --- arch/arm/mach-s5pv210/Kconfig | 7 +++++++ arch/arm/mach-s5pv210/mach-aquila.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 5206562..fed64f5 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -63,10 +63,17 @@ menu "S5PC110 Machines" config MACH_AQUILA bool "Aquila" select CPU_S5PV210 + select COMMON_AQUILA_GONI select ARCH_SPARSEMEM_ENABLE select S5PV210_SETUP_FB_24BPP select S5PV210_SETUP_SDHCI select S3C_DEV_FB + select S5P_DEV_FIMC0 + select S5PV210_SETUP_FIMC0 + select S5P_DEV_FIMC1 + select S5PV210_SETUP_FIMC1 + select S5P_DEV_FIMC2 + select S5PV210_SETUP_FIMC2 select S5PC110_DEV_ONENAND select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 6b60358..927bf47 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/serial_core.h> #include <linux/fb.h> +#include <linux/clk.h> #include <linux/gpio.h> #include <linux/i2c.h> #include <linux/i2c-gpio.h> @@ -41,9 +42,13 @@ #include <plat/devs.h> #include <plat/cpu.h> #include <plat/fb.h> +#include <plat/fimc.h> +#include <plat/fifo.h> #include <plat/gpio-cfg.h> #include <plat/sdhci.h> +#include "common-aquila-goni.h" + /* Following are default values for UCON, ULCON and UFCON UART registers */ #define S5PV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ S3C2410_UCON_RXILEVEL | \ @@ -577,6 +582,9 @@ static struct platform_device *aquila_devices[] __initdata = { &universal_spi_gpio, &s5pc110_device_onenand, &s3c_device_usbgadget, + &s5p_device_fimc0, + &s5p_device_fimc1, + &s5p_device_fimc2, &s3c_device_hsmmc0, &s3c_device_hsmmc1, &s3c_device_hsmmc2, @@ -599,13 +607,25 @@ static void __init aquila_machine_init(void) /* SPI */ spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); + /* FIMC */ + s5p_fimc0_set_platdata(NULL); + s5p_fimc1_set_platdata(NULL); + s5p_fimc2_set_platdata(NULL); + /* SDHCI */ aquila_setup_sdhci(); /* FB */ s3c_fb_set_platdata(&aquila_lcd_pdata); + /* FIMC->FB fifo links */ + s5pv210_setup_fimc0_fb_link(); + s5pv210_setup_fimc1_fb_link(); + s5pv210_setup_fimc2_fb_link(); + platform_add_devices(aquila_devices, ARRAY_SIZE(aquila_devices)); + + s5pv210_common_fimc_clk_init(); } MACHINE_START(AQUILA, "Aquila") -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html