From: Roger Quadros <roger.quadros@nokia.com>
To: Tomi.Valkeinen@nokia.com
Cc: linux-fbdev-devel@lists.sourceforge.net, linux-omap@vger.kernel.org
Subject: [RFC][PATCH 1/3] OMAP: DSS2: Do regulator stuff in dpi_init_display()
Date: Fri, 12 Mar 2010 17:27:22 +0200 [thread overview]
Message-ID: <1268407644-31230-2-git-send-email-roger.quadros@nokia.com> (raw)
In-Reply-To: <1268407644-31230-1-git-send-email-roger.quadros@nokia.com>
From: Roger Quadros <roger.quadros@nokia.com>
We don't want dpi_init() to fail in any case as it will prevent us
from using DSS2 if we don't have DSI in the system. This is because
dpi_init() is done unconditionally by the DSS2 core.
We will only need to do regulator initialization when DPI is actually
present in the system. So we do regulator init stuff in dpi_init_display()
Signed-off-by: Roger Quadros <roger.quadros@nokia.com>
---
drivers/video/omap2/dss/dpi.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 960e977..bcedafd 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -299,11 +299,6 @@ int dpi_init_display(struct omap_dss_device *dssdev)
{
DSSDBG("init_display\n");
- return 0;
-}
-
-int dpi_init(struct platform_device *pdev)
-{
if (cpu_is_omap34xx()) {
dpi.vdds_dsi_reg = dss_get_vdds_dsi();
if (IS_ERR(dpi.vdds_dsi_reg)) {
@@ -315,6 +310,11 @@ int dpi_init(struct platform_device *pdev)
return 0;
}
+int dpi_init(struct platform_device *pdev)
+{
+ return 0;
+}
+
void dpi_exit(void)
{
}
--
1.6.0.4
next prev parent reply other threads:[~2010-03-12 15:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-12 15:27 [RFC][PATCH 0/3] OMAP: DSS2: Allow us to use SDI Roger Quadros
2010-03-12 15:27 ` Roger Quadros [this message]
2010-03-12 15:27 ` [RFC][PATCH 2/3] OMAP: DSS2: Prevent recursive Panel Enable/Disable calls from SDI Roger Quadros
2010-03-12 15:27 ` [RFC][PATCH 3/3] OMAP: DSS2: Use vdds_sdi regulator supply in SDI Roger Quadros
2010-03-15 9:53 ` [RFC][PATCH 3/3] OMAP: DSS2: Use vdds_sdi regulator supply in Tomi Valkeinen
2010-03-15 11:26 ` Roger Quadros
2010-03-15 11:32 ` Tomi Valkeinen
2010-03-15 9:32 ` [RFC][PATCH 2/3] OMAP: DSS2: Prevent recursive Panel Tomi Valkeinen
2010-03-15 9:52 ` Tomi Valkeinen
2010-03-15 9:30 ` [RFC][PATCH 1/3] OMAP: DSS2: Do regulator stuff in Tomi Valkeinen
2010-03-15 9:57 ` [RFC][PATCH 1/3] OMAP: DSS2: Do regulator stuff in dpi_init_display() Roger Quadros
-- strict thread matches above, loose matches on Subject: below --
2010-03-12 15:37 Roger Quadros
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=1268407644-31230-2-git-send-email-roger.quadros@nokia.com \
--to=roger.quadros@nokia.com \
--cc=Tomi.Valkeinen@nokia.com \
--cc=linux-fbdev-devel@lists.sourceforge.net \
--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).