From: Sumit Semwal <sumit.semwal@ti.com>
To: tomi.valkeinen@nokia.com, paul@pwsan.com,
khilman@deeprootsystems.com, hvaibhav@ti.com,
linux-omap@vger.kernel.org
Cc: Sumit Semwal <sumit.semwal@ti.com>,
Senthilvadivu Guruswamy <svadivu@ti.com>
Subject: [PATCH v5 06/17] OMAP2,3: DSS2: Create new file display.c for central dss driver registration.
Date: Fri, 7 Jan 2011 16:55:40 +0530 [thread overview]
Message-ID: <1294399551-10457-7-git-send-email-sumit.semwal@ti.com> (raw)
In-Reply-To: <1294399551-10457-1-git-send-email-sumit.semwal@ti.com>
A new file display.c is introduced for display driver init, which adds a function
omap_display_init to do the DSS driver registration. This is the first step in moving
away registration of DSS from board files into a common place.
Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
---
arch/arm/mach-omap2/Makefile | 2 +
arch/arm/mach-omap2/display.c | 57 +++++++++++++++++++++++++++++
arch/arm/plat-omap/include/plat/display.h | 4 ++
3 files changed, 63 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-omap2/display.c
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 4ab82f6..57b89e6 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -237,3 +237,5 @@ obj-y += $(smc91x-m) $(smc91x-y)
smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o
obj-y += $(smsc911x-m) $(smsc911x-y)
+
+obj-y += display.o
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
new file mode 100644
index 0000000..26d3feb
--- /dev/null
+++ b/arch/arm/mach-omap2/display.c
@@ -0,0 +1,57 @@
+/*
+ * OMAP2plus display device setup / initialization.
+ *
+ * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
+ * Senthilvadivu Guruswamy
+ * Sumit Semwal
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+
+#include <plat/display.h>
+#include <plat/omap_hwmod.h>
+#include <plat/omap_device.h>
+
+#ifdef CONFIG_OMAP2_DSS
+
+static struct platform_device omap_display_device = {
+ .name = "omap_display",
+ .id = -1,
+ .dev = {
+ .platform_data = NULL,
+ },
+};
+
+int __init omap_display_init(struct omap_dss_board_info
+ *board_data)
+{
+ int r = 0;
+ omap_display_device.dev.platform_data = board_data;
+
+ r = platform_device_register(&omap_display_device);
+ if (r < 0)
+ printk(KERN_ERR "Unable to register OMAP-Display device\n");
+
+ return r;
+}
+
+#else
+int __init omap_display_init(struct omap_dss_board_info *board_data)
+{
+ return 0;
+}
+#endif
diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h
index c915a66..871bbae 100644
--- a/arch/arm/plat-omap/include/plat/display.h
+++ b/arch/arm/plat-omap/include/plat/display.h
@@ -23,6 +23,7 @@
#include <linux/list.h>
#include <linux/kobject.h>
#include <linux/device.h>
+#include <linux/platform_device.h>
#include <asm/atomic.h>
#define DISPC_IRQ_FRAMEDONE (1 << 0)
@@ -220,6 +221,9 @@ struct omap_dss_board_info {
struct omap_dss_device *default_device;
};
+/* Init with the board info */
+extern int omap_display_init(struct omap_dss_board_info *board_data);
+
struct omap_video_timings {
/* Unit: pixels */
u16 x_res;
--
1.7.0.4
next prev parent reply other threads:[~2011-01-07 11:26 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-07 11:25 [PATCH v5 00/17] OMAP2,3: hwmod DSS Adaptation Sumit Semwal
2011-01-07 11:25 ` [PATCH v5 01/17] OMAP2420: hwmod data: add DSS DISPC RFBI VENC Sumit Semwal
2011-01-10 23:21 ` Paul Walmsley
2011-01-07 11:25 ` [PATCH v5 02/17] OMAP2430: " Sumit Semwal
2011-01-10 23:43 ` Paul Walmsley
2011-01-07 11:25 ` [PATCH v5 03/17] OMAP3: hwmod data: add DSS DISPC RFBI DSI VENC Sumit Semwal
2011-01-10 22:51 ` Paul Walmsley
2011-01-07 11:25 ` [PATCH v5 04/17] OMAP2,3 DSS2 Change driver name to omap_display Sumit Semwal
2011-01-10 23:55 ` Paul Walmsley
2011-01-11 5:17 ` Semwal, Sumit
2011-01-07 11:25 ` [PATCH v5 05/17] OMAP2,3 DSS2 Use Regulator init with driver name Sumit Semwal
2011-01-07 11:25 ` Sumit Semwal [this message]
2011-01-07 14:03 ` [PATCH v5 06/17] OMAP2,3: DSS2: Create new file display.c for central dss driver registration Tomi Valkeinen
2011-01-09 6:59 ` Semwal, Sumit
2011-01-09 7:01 ` Semwal, Sumit
2011-01-07 21:26 ` Kevin Hilman
2011-01-09 7:00 ` Semwal, Sumit
2011-01-07 11:25 ` [PATCH v5 07/17] OMAP2,3: DSS2: board files: replace platform_device_register with omap_display_init() Sumit Semwal
2011-01-07 11:25 ` [PATCH v5 08/17] OMAP2,3: DSS2: Build omap_device for each DSS HWIP Sumit Semwal
2011-01-07 23:34 ` Kevin Hilman
2011-01-09 8:04 ` Semwal, Sumit
2011-01-07 11:25 ` [PATCH v5 09/17] OMAP2,3: DSS2: DSS: create platform_driver, move init,exit to driver Sumit Semwal
2011-01-07 23:43 ` Kevin Hilman
2011-01-09 8:33 ` Semwal, Sumit
2011-01-07 11:25 ` [PATCH v5 10/17] OMAP2,3: DSS2: Move clocks from core driver to dss driver Sumit Semwal
2011-01-10 23:59 ` Paul Walmsley
2011-01-11 5:16 ` Semwal, Sumit
2011-01-07 11:25 ` [PATCH v5 11/17] OMAP2,3: DSS2: RFBI: create platform_driver, move init,exit to driver Sumit Semwal
2011-01-07 11:25 ` [PATCH v5 12/17] OMAP2,3: DSS2: DISPC: " Sumit Semwal
2011-01-07 11:25 ` [PATCH v5 13/17] OMAP2,3: DSS2: VENC: " Sumit Semwal
2011-01-07 11:25 ` [PATCH v5 14/17] OMAP2,3: DSS2: DSI: " Sumit Semwal
2011-01-07 11:25 ` [PATCH v5 15/17] OMAP2,3: DSS2: replace printk with dev_dbg in init Sumit Semwal
2011-01-07 11:25 ` [PATCH v5 16/17] OMAP2,3: DSS2: Use platform device to get baseaddr Sumit Semwal
2011-01-07 11:25 ` [PATCH v5 17/17] OMAP2,3: DSS2: Get DSS IRQ from platform device Sumit Semwal
2011-01-10 20:00 ` Paul Walmsley
2011-01-07 12:56 ` [PATCH v5 00/17] OMAP2,3: hwmod DSS Adaptation Tomi Valkeinen
2011-01-07 13:14 ` Tomi Valkeinen
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=1294399551-10457-7-git-send-email-sumit.semwal@ti.com \
--to=sumit.semwal@ti.com \
--cc=hvaibhav@ti.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=svadivu@ti.com \
--cc=tomi.valkeinen@nokia.com \
/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