From patchwork Sun Mar 28 07:48:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaolin Zhang X-Patchwork-Id: 88741 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2S7mHcb032002 for ; Sun, 28 Mar 2010 07:48:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753918Ab0C1HsQ (ORCPT ); Sun, 28 Mar 2010 03:48:16 -0400 Received: from mga09.intel.com ([134.134.136.24]:63559 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753903Ab0C1HsP convert rfc822-to-8bit (ORCPT ); Sun, 28 Mar 2010 03:48:15 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 28 Mar 2010 00:45:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.51,321,1267430400"; d="scan'208,223";a="504314338" Received: from pgsmsx603.gar.corp.intel.com ([10.221.43.87]) by orsmga002.jf.intel.com with ESMTP; 28 Mar 2010 00:47:17 -0700 Received: from shzsmsx502.ccr.corp.intel.com (10.239.4.97) by pgsmsx603.gar.corp.intel.com (10.221.43.87) with Microsoft SMTP Server (TLS) id 8.2.176.0; Sun, 28 Mar 2010 15:48:13 +0800 Received: from shsmsx501.ccr.corp.intel.com ([10.239.4.141]) by shzsmsx502.ccr.corp.intel.com ([10.239.4.97]) with mapi; Sun, 28 Mar 2010 15:48:12 +0800 From: "Zhang, Xiaolin" To: "linux-media@vger.kernel.org" CC: "Zhu, Daniel" , "Yu, Jinlu" , "Wang, Wen W" , "Huang, Kai" , "Hu, Gang A" , "Ba, Zheng" , "Zhang, Xiaolin" Date: Sun, 28 Mar 2010 15:48:11 +0800 Subject: [PATCH v2 10/10] V4L2 patches for Intel Moorestown Camera Imaging Drivers Thread-Topic: [PATCH v2 10/10] V4L2 patches for Intel Moorestown Camera Imaging Drivers Thread-Index: AcrOSwPOUETNo5+VTEiIQ81tU7emQw== Message-ID: <33AB447FBD802F4E932063B962385B351D6D5354@shsmsx501.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 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.3 (demeter.kernel.org [140.211.167.41]); Sun, 28 Mar 2010 07:48:18 +0000 (UTC) diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index dcf9fa9..1b3726f 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -954,4 +954,5 @@ config USB_S2255 This driver can be compiled as a module, called s2255drv. endif # V4L_USB_DRIVERS +source "drivers/media/video/mrstci/Kconfig" endif # VIDEO_CAPTURE_DRIVERS diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 9f2e321..6a4b5ff 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -160,6 +160,15 @@ obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o +obj-$(CONFIG_VIDEO_MRST_OV2650) += mrstci/mrstov2650/ +obj-$(CONFIG_VIDEO_MRST_OV5630) += mrstci/mrstov5630/ +obj-$(CONFIG_VIDEO_MRST_OV5630_MOTOR) += mrstci/mrstov5630_motor/ +obj-$(CONFIG_VIDEO_MRST_S5K4E1) += mrstci/mrsts5k4e1/ +obj-$(CONFIG_VIDEO_MRST_S5K4E1_MOTOR) += mrstci/mrsts5k4e1_motor/ +obj-$(CONFIG_VIDEO_MRST_OV9665) += mrstci/mrstov9665/ +obj-$(CONFIG_VIDEO_MRST_FLASH) += mrstci/mrstflash/ +obj-$(CONFIG_VIDEO_MRST_ISP) += mrstci/mrstisp/ + EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/frontends EXTRA_CFLAGS += -Idrivers/media/common/tuners diff --git a/drivers/media/video/mrstci/Kconfig b/drivers/media/video/mrstci/Kconfig new file mode 100644 index 0000000..9ac7065 --- /dev/null +++ b/drivers/media/video/mrstci/Kconfig @@ -0,0 +1,26 @@ +menuconfig VIDEO_MRSTCI + bool "Moorestown Langwell Camera Imaging Subsystem support" + depends on VIDEO_V4L2 + default y + + ---help--- + Say Y here to enable selecting the Intel Moorestown Langwell Camera Imaging Subsystem for webcams. + +if VIDEO_MRSTCI && VIDEO_V4L2 + +source "drivers/media/video/mrstci/mrstisp/Kconfig" + +source "drivers/media/video/mrstci/mrstov5630/Kconfig" +source "drivers/media/video/mrstci/mrstov5630_motor/Kconfig" + +source "drivers/media/video/mrstci/mrsts5k4e1/Kconfig" +source "drivers/media/video/mrstci/mrsts5k4e1_motor/Kconfig" + +source "drivers/media/video/mrstci/mrstflash/Kconfig" + +source "drivers/media/video/mrstci/mrstov2650/Kconfig" + +source "drivers/media/video/mrstci/mrstov9665/Kconfig" + +endif # VIDEO_MRSTCI + diff --git a/drivers/media/video/mrstci/Makefile b/drivers/media/video/mrstci/Makefile new file mode 100644 index 0000000..9d3449e --- /dev/null +++ b/drivers/media/video/mrstci/Makefile @@ -0,0 +1,8 @@ +obj-$(CONFIG_VIDEO_MRST_OV2650) += mrstov2650/ +obj-$(CONFIG_VIDEO_MRST_OV9665) += mrstov9665/ +obj-$(CONFIG_VIDEO_MRST_OV5630) += mrstov5630/ +obj-$(CONFIG_VIDEO_MRST_OV5630_MOTOR) += mrstov5630_motor/ +obj-$(CONFIG_VIDEO_MRST_S5K4E1) += mrsts5k4e1/ +obj-$(CONFIG_VIDEO_MRST_S5K4E1_MOTOR) += mrsts5k4e1_motor/ +obj-$(CONFIG_VIDEO_MRST_FLASH) += mrstflash/ +obj-$(CONFIG_VIDEO_MRST_ISP) += mrstisp/