From patchwork Wed May 11 15:17:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 777142 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4BGeJ21028398 for ; Wed, 11 May 2011 16:40:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756865Ab1EKQkH (ORCPT ); Wed, 11 May 2011 12:40:07 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:47550 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755142Ab1EKPrm (ORCPT ); Wed, 11 May 2011 11:47:42 -0400 Received: from spt2.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0LL1002FXEHCPZ@mailout1.w1.samsung.com>; Wed, 11 May 2011 16:17:37 +0100 (BST) 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 <0LL100D9EEHBED@spt2.w1.samsung.com>; Wed, 11 May 2011 16:17:36 +0100 (BST) Received: from localhost.localdomain (davsrvsmtp01.bs.local [106.116.38.10]) by linux.samsung.com (Postfix) with ESMTP id 9897C270076; Wed, 11 May 2011 17:19:23 +0200 (CEST) Date: Wed, 11 May 2011 17:17:09 +0200 From: Sylwester Nawrocki Subject: [PATCH 2/3 v5] v4l: Move s5p-fimc driver into Video capture devices In-reply-to: <1305127030-30162-1-git-send-email-s.nawrocki@samsung.com> To: linux-media@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org, laurent.pinchart@ideasonboard.com, kyungmin.park@samsung.com, m.szyprowski@samsung.com, riverful.kim@samsung.com, kgene.kim@samsung.com, sungchun.kang@samsung.com, jonghun.han@samsung.com, Sylwester Nawrocki Message-id: <1305127030-30162-3-git-send-email-s.nawrocki@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.2.5 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT References: <1305127030-30162-1-git-send-email-s.nawrocki@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 (demeter2.kernel.org [140.211.167.43]); Wed, 11 May 2011 16:40:20 +0000 (UTC) s5p-fimc now also implements a camera capture video node so move it under the "Video capture devices" kernel config menu. Also update the entry to reflect the driver's coverage of EXYNOS4 SoCs. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park --- drivers/media/video/Kconfig | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index d61414e..a705493 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -934,6 +934,17 @@ config VIDEO_MX2 This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor Interface +config VIDEO_SAMSUNG_S5P_FIMC + tristate "Samsung S5P and EXYNOS4 camera host interface driver" + depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + ---help--- + This is a v4l2 driver for Samsung S5P and EXYNOS4 camera + host interface and video postprocessor. + + To compile this driver as a module, choose M here: the + module will be called s5p-fimc. # # USB Multimedia device configuration @@ -1029,13 +1040,5 @@ config VIDEO_MEM2MEM_TESTDEV This is a virtual test device for the memory-to-memory driver framework. -config VIDEO_SAMSUNG_S5P_FIMC - tristate "Samsung S5P FIMC (video postprocessor) driver" - depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This is a v4l2 driver for the S5P camera interface - (video postprocessor) endif # V4L_MEM2MEM_DRIVERS