From patchwork Mon Jan 4 14:42:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 70664 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o04EgOFE026292 for ; Mon, 4 Jan 2010 14:42:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753465Ab0ADOmT (ORCPT ); Mon, 4 Jan 2010 09:42:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752215Ab0ADOmS (ORCPT ); Mon, 4 Jan 2010 09:42:18 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:35174 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753094Ab0ADOmP (ORCPT ); Mon, 4 Jan 2010 09:42:15 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o04EgB2U031331 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 4 Jan 2010 08:42:14 -0600 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o04Eg9XH018573; Mon, 4 Jan 2010 20:12:10 +0530 (IST) From: hvaibhav@ti.com To: linux-media@vger.kernel.org Cc: linux-omap@vger.kernel.org, hverkuil@xs4all.nl, tony@atomide.com, Vaibhav Hiremath Subject: [PATCH 2/2] OMAP2/3: Add V4L2 DSS driver support in device.c Date: Mon, 4 Jan 2010 20:12:09 +0530 Message-Id: <1262616129-23373-3-git-send-email-hvaibhav@ti.com> X-Mailer: git-send-email 1.6.2.4 In-Reply-To: References: Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 30b5db7..64f2a3a 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -357,6 +357,34 @@ static void omap_init_wdt(void) static inline void omap_init_wdt(void) {} #endif +/*---------------------------------------------------------------------------*/ + +#if defined(CONFIG_VIDEO_OMAP2_VOUT) || \ + defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE) +#if defined (CONFIG_FB_OMAP2) || defined (CONFIG_FB_OMAP2_MODULE) +static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = { +}; +#else +static struct resource omap_vout_resource[2] = { +}; +#endif + +static struct platform_device omap_vout_device = { + .name = "omap_vout", + .num_resources = ARRAY_SIZE(omap_vout_resource), + .resource = &omap_vout_resource[0], + .id = -1, +}; +static void omap_init_vout(void) +{ + (void) platform_device_register(&omap_vout_device); +} +#else +static inline void omap_init_vout(void) {} +#endif + +/*---------------------------------------------------------------------------*/ + /* * This gets called after board-specific INIT_MACHINE, and initializes most * on-chip peripherals accessible on this board (except for few like USB): @@ -387,6 +415,7 @@ static int __init omap_init_devices(void) omap_init_rng(); omap_init_uwire(); omap_init_wdt(); + omap_init_vout(); return 0; } arch_initcall(omap_init_devices);