From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org, Vaibhav Hiremath <hvaibhav@ti.com>
Subject: [PATCH 01/18] OMAP2/3: Add V4L2 DSS driver support in device.c
Date: Wed, 05 May 2010 12:32:32 -0700 [thread overview]
Message-ID: <20100505193232.21568.81543.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100505192957.21568.19569.stgit@baageli.muru.com>
From: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/devices.c | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 2271b9b..10f3a3c 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -786,6 +786,33 @@ static inline void omap_hdq_init(void)
static inline void omap_hdq_init(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)
+{
+ if (platform_device_register(&omap_vout_device) < 0)
+ printk(KERN_ERR "Unable to register OMAP-VOUT device\n");
+}
+#else
+static inline void omap_init_vout(void) {}
+#endif
+
/*-------------------------------------------------------------------------*/
static int __init omap2_init_devices(void)
@@ -800,6 +827,7 @@ static int __init omap2_init_devices(void)
omap_hdq_init();
omap_init_sti();
omap_init_sha1_md5();
+ omap_init_vout();
return 0;
}
next prev parent reply other threads:[~2010-05-05 19:32 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-05 19:32 [PATCH 00/18] omap platform data and board updates for 2.6.35 merge window Tony Lindgren
2010-05-05 19:32 ` Tony Lindgren [this message]
2010-05-05 19:32 ` [PATCH 02/18] omap1: amsdelta: defconfig updates Tony Lindgren
2010-05-05 19:32 ` [PATCH 03/18] omap2: Add I2C bus 1 initialisation for 2430sdp Tony Lindgren
2010-05-05 19:32 ` [PATCH 04/18] omap2: Add OHCI USB platform init for 2430 SDP Tony Lindgren
2010-05-05 19:32 ` [PATCH 05/18] omap2: select ARCH_OMAP_OTG for OMAP2430 SDP Tony Lindgren
2010-05-05 19:32 ` [PATCH 06/18] omap: Devkit8000: Add mux initialization Tony Lindgren
2010-05-05 19:32 ` [PATCH 07/18] omap: Devkit8000: Update default configuration Tony Lindgren
2010-05-05 19:32 ` [PATCH 08/18] can:ti_hecc: board specific hookup on AM3517EVM Tony Lindgren
2010-05-05 19:33 ` [PATCH 09/18] can:ti_hecc: Enable CAN support on AM3517 Tony Lindgren
2010-05-05 19:33 ` [PATCH 10/18] AM35xx EMAC : define submodule offsets Tony Lindgren
2010-05-05 19:33 ` [PATCH 11/18] AM35xx : Platform specific hookup for EMAC module Tony Lindgren
2010-05-05 19:33 ` [PATCH 12/18] OMAP3 : clock data: Update name string for EMAC clocks Tony Lindgren
2010-05-05 19:45 ` Russell King - ARM Linux
2010-05-05 20:02 ` Tony Lindgren
2010-05-10 20:17 ` Tony Lindgren
2010-05-05 19:33 ` [PATCH 13/18] AM3517 defconfig update : enable EMAC support Tony Lindgren
2010-05-05 19:33 ` [PATCH 14/18] omap: Overo: Add support for second ethernet port Tony Lindgren
2010-05-18 13:41 ` Steve Sakoman
2010-05-19 18:27 ` Tony Lindgren
2010-05-21 20:15 ` [PATCH 14/18 FIX] " Steve Sakoman
2010-05-31 12:31 ` [APPLIED] [PATCH 14/18 FIX] omap: Overo: Add support for second ethernet Tony Lindgren
2010-05-05 19:33 ` [PATCH 15/18] omap: rx51: Change the TWL4030 VMMC2 voltage constraints andsupply name Tony Lindgren
2010-05-05 19:33 ` [PATCH 16/18] omap: rx51: Add i2c2 board_info with tlv320aic3x Tony Lindgren
2010-05-05 19:33 ` [PATCH 17/18] omap: rx51: Add supplies for the tlv320aic3x codec driver Tony Lindgren
2010-05-06 6:57 ` Eduardo Valentin
2010-05-06 7:00 ` Eduardo Valentin
2010-05-18 10:00 ` Jarkko Nikula
2010-05-05 19:33 ` [PATCH 18/18] AM35x: fix UI card EHCI port and LCD dependency Tony Lindgren
2010-05-05 20:21 ` [PATCH 00/18] omap platform data and board updates for 2.6.35 merge window Koen Kooi
2010-05-05 21:09 ` Tony Lindgren
2010-05-06 7:27 ` Koen Kooi
2010-05-06 7:42 ` Tomi Valkeinen
2010-05-06 15:44 ` Tony Lindgren
2010-05-10 7:57 ` Tomi Valkeinen
2010-05-10 22:25 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100505193232.21568.81543.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=hvaibhav@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).