From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Archit Taneja <archit@ti.com>,
Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Subject: linux-next: manual merge of the omap_dss2 tree with Linus' tree
Date: Fri, 7 Sep 2012 13:29:12 +1000 [thread overview]
Message-ID: <20120907132912.dc29219f9ae62b7befbd7401@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1540 bytes --]
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in drivers/video/omap2/dss/sdi.c between commit 35d678664873 ("OMAPDSS: Fix SDI PLL locking") from Linus' tree and commit 889b4fd7eed2 ("OMAPDSS: SDI: Maintain copy of data pairs in driver data") from the omap_dss2 tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/video/omap2/dss/sdi.c
index f43bfe1,3bf1bfe..0000000
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@@ -105,21 -107,8 +107,22 @@@ int omapdss_sdi_display_enable(struct o
sdi_config_lcd_manager(dssdev);
+ /*
+ * LCLK and PCLK divisors are located in shadow registers, and we
+ * normally write them to DISPC registers when enabling the output.
+ * However, SDI uses pck-free as source clock for its PLL, and pck-free
+ * is affected by the divisors. And as we need the PLL before enabling
+ * the output, we need to write the divisors early.
+ *
+ * It seems just writing to the DISPC register is enough, and we don't
+ * need to care about the shadow register mechanism for pck-free. The
+ * exact reason for this is unknown.
+ */
+ dispc_mgr_set_clock_div(dssdev->manager->id,
+ &sdi.mgr_config.clock_info);
+
- dss_sdi_init(dssdev->phy.sdi.datapairs);
+ dss_sdi_init(sdi.datapairs);
+
r = dss_sdi_enable();
if (r)
goto err_sdi_enable;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-07 3:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-07 3:29 Stephen Rothwell [this message]
2012-11-26 5:22 linux-next: manual merge of the omap_dss2 tree with Linus' tree Stephen Rothwell
2012-11-27 11:24 ` Tomi Valkeinen
2013-04-08 4:36 Stephen Rothwell
2013-04-09 10:10 ` Tomi Valkeinen
2013-04-10 0:13 ` Stephen Rothwell
2013-04-10 0:41 ` Linus Torvalds
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=20120907132912.dc29219f9ae62b7befbd7401@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=FlorianSchandinat@gmx.de \
--cc=archit@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tomi.valkeinen@ti.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;
as well as URLs for NNTP newsgroup(s).