From patchwork Fri Mar 4 09:01:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 608151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2491Xfq013906 for ; Fri, 4 Mar 2011 09:01:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759325Ab1CDJBh (ORCPT ); Fri, 4 Mar 2011 04:01:37 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:22339 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752896Ab1CDJBd (ORCPT ); Fri, 4 Mar 2011 04:01:33 -0500 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from spt2.w1.samsung.com ([210.118.77.13]) by mailout3.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0LHI00D7DZQFBH10@mailout3.w1.samsung.com>; Fri, 04 Mar 2011 09:01:28 +0000 (GMT) Received: from linux.samsung.com ([106.116.38.10]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LHI00JGLZQEJ7@spt2.w1.samsung.com>; Fri, 04 Mar 2011 09:01:27 +0000 (GMT) Received: from localhost.localdomain (smtp.w1.samsung.com [106.116.38.10]) by linux.samsung.com (Postfix) with ESMTP id 54F3527006A; Fri, 04 Mar 2011 10:02:11 +0100 (CET) Date: Fri, 04 Mar 2011 10:01:14 +0100 From: Marek Szyprowski Subject: [PATCH 7/7] ARM: S5PC210: enable FIMC on Universal_C210 In-reply-to: <1299229274-9753-1-git-send-email-m.szyprowski@samsung.com> To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Cc: m.szyprowski@samsung.com, kyungmin.park@samsung.com, kgene.kim@samsung.com, andrzej.p@samsung.com, t.stanislaws@samsung.com, s.nawrocki@samsung.com, k.debski@samsung.com Message-id: <1299229274-9753-8-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.2.3 References: <1299229274-9753-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 04 Mar 2011 09:01:53 +0000 (UTC) diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig index a8b0425..c850086 100644 --- a/arch/arm/mach-s5pv310/Kconfig +++ b/arch/arm/mach-s5pv310/Kconfig @@ -97,12 +97,18 @@ config MACH_UNIVERSAL_C210 bool "Mobile UNIVERSAL_C210 Board" select CPU_S5PV310 select S5P_DEV_ONENAND + select S5P_DEV_FIMC0 + select S5P_DEV_FIMC1 + select S5P_DEV_FIMC2 + select S5P_DEV_FIMC3 select S3C_DEV_HSMMC select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 select S5PV310_SETUP_SDHCI select S3C_DEV_I2C1 select S3C_DEV_I2C5 + select S5PV310_DEV_PD + select S5PV310_DEV_SYSMMU select S5PV310_SETUP_I2C1 select S5PV310_SETUP_I2C5 help diff --git a/arch/arm/mach-s5pv310/mach-universal_c210.c b/arch/arm/mach-s5pv310/mach-universal_c210.c index eece381..f153895 100644 --- a/arch/arm/mach-s5pv310/mach-universal_c210.c +++ b/arch/arm/mach-s5pv310/mach-universal_c210.c @@ -24,7 +24,9 @@ #include #include #include +#include #include +#include #include #include @@ -816,6 +818,15 @@ static struct platform_device *universal_devices[] __initdata = { &s3c_device_hsmmc0, &s3c_device_hsmmc2, &s3c_device_hsmmc3, + &s5p_device_fimc0, + &s5p_device_fimc1, + &s5p_device_fimc2, + &s5p_device_fimc3, + &s5pv310_device_pd[PD_CAM], + &s5pv310_device_sysmmu[S5P_SYSMMU_FIMC0], + &s5pv310_device_sysmmu[S5P_SYSMMU_FIMC1], + &s5pv310_device_sysmmu[S5P_SYSMMU_FIMC2], + &s5pv310_device_sysmmu[S5P_SYSMMU_FIMC3], /* Universal Devices */ &universal_gpio_keys, @@ -842,6 +853,15 @@ static void __init universal_machine_init(void) /* Last */ platform_add_devices(universal_devices, ARRAY_SIZE(universal_devices)); + + s5p_device_fimc0.dev.parent = &s5pv310_device_pd[PD_CAM].dev; + s5p_device_fimc1.dev.parent = &s5pv310_device_pd[PD_CAM].dev; + s5p_device_fimc2.dev.parent = &s5pv310_device_pd[PD_CAM].dev; + s5p_device_fimc3.dev.parent = &s5pv310_device_pd[PD_CAM].dev; + s5pv310_device_sysmmu[S5P_SYSMMU_FIMC0].dev.parent = &s5pv310_device_pd[PD_CAM].dev; + s5pv310_device_sysmmu[S5P_SYSMMU_FIMC1].dev.parent = &s5pv310_device_pd[PD_CAM].dev; + s5pv310_device_sysmmu[S5P_SYSMMU_FIMC2].dev.parent = &s5pv310_device_pd[PD_CAM].dev; + s5pv310_device_sysmmu[S5P_SYSMMU_FIMC3].dev.parent = &s5pv310_device_pd[PD_CAM].dev; } MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")