From: Archit Taneja <archit@ti.com>
To: linux-omap@vger.kernel.org
Cc: tomi.valkeinen@nokia.com, "Semwal, Sumit" <sumit.semwal@ti.com>,
Senthilvadivu Guruswamy <svadivu@ti.com>,
Mukund Mittal <mmittal@ti.com>, Archit Taneja <archit@ti.com>,
Samreen <samreen@ti.com>
Subject: [RFC][PATCH 4/8] OMAP: DSS2: OMAP4 Secondary LCD Channel DISPC Registers
Date: Thu, 1 Jul 2010 16:01:21 +0530 [thread overview]
Message-ID: <1277980285-20996-5-git-send-email-archit@ti.com> (raw)
In-Reply-To: <1277980285-20996-4-git-send-email-archit@ti.com>
From: Semwal, Sumit <sumit.semwal@ti.com>
Introduce OMAP4 DISPC base address and Secondary LCD Channel registers, use them
in register dumps.
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
Signed-off-by: Mukund Mittal <mmittal@ti.com>
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Samreen <samreen@ti.com>
---
drivers/video/omap2/dss/dispc.c | 42 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 5ecdc00..08b36d6
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -41,9 +41,13 @@
#include "dss.h"
/* DISPC */
+#ifdef CONFIG_ARCH_OMAP4
+#define DISPC_BASE 0x58001000
+#define DISPC_SZ_REGS SZ_16K
+#else
#define DISPC_BASE 0x48050400
-
#define DISPC_SZ_REGS SZ_1K
+#endif
struct dispc_reg { u16 idx; };
@@ -68,6 +72,7 @@ struct dispc_reg { u16 idx; };
#define DISPC_TIMING_V DISPC_REG(0x0068)
#define DISPC_POL_FREQ DISPC_REG(0x006C)
#define DISPC_DIVISOR DISPC_REG(0x0070)
+#define DISPC_DIVISOR1 DISPC_REG(0x0804)
#define DISPC_GLOBAL_ALPHA DISPC_REG(0x0074)
#define DISPC_SIZE_DIG DISPC_REG(0x0078)
#define DISPC_SIZE_LCD DISPC_REG(0x007C)
@@ -131,6 +136,23 @@ struct dispc_reg { u16 idx; };
DISPC_IRQ_SYNC_LOST | \
DISPC_IRQ_SYNC_LOST_DIGIT)
+/* OMAP4 new global registers */
+#define DISPC_CONTROL2 DISPC_REG(0x0238)
+#define DISPC_DEFAULT_COLOR2 DISPC_REG(0x03AC)
+#define DISPC_TRANS_COLOR2 DISPC_REG(0x03B0)
+#define DISPC_CPR2_COEF_B DISPC_REG(0x03B4)
+#define DISPC_CPR2_COEF_G DISPC_REG(0x03B8)
+#define DISPC_CPR2_COEF_R DISPC_REG(0x03BC)
+#define DISPC_DATA2_CYCLE1 DISPC_REG(0x03C0)
+#define DISPC_DATA2_CYCLE2 DISPC_REG(0x03C4)
+#define DISPC_DATA2_CYCLE3 DISPC_REG(0x03C8)
+#define DISPC_SIZE_LCD2 DISPC_REG(0x03CC)
+#define DISPC_TIMING_H2 DISPC_REG(0x0400)
+#define DISPC_TIMING_V2 DISPC_REG(0x0404)
+#define DISPC_POL_FREQ2 DISPC_REG(0x0408)
+#define DISPC_DIVISOR2 DISPC_REG(0x040C)
+#define DISPC_CONFIG2 DISPC_REG(0x0620)
+
#define DISPC_MAX_NR_ISRS 8
struct omap_dispc_isr_data {
@@ -2361,6 +2383,24 @@ void dispc_dump_regs(struct seq_file *s)
DUMPREG(DISPC_SIZE_DIG);
DUMPREG(DISPC_SIZE_LCD);
+ /* OMAP4 LCD2 channel registers*/
+ if (cpu_is_omap44xx()) {
+ DUMPREG(DISPC_CONTROL2);
+ DUMPREG(DISPC_DEFAULT_COLOR2);
+ DUMPREG(DISPC_TRANS_COLOR2);
+ DUMPREG(DISPC_CPR2_COEF_B);
+ DUMPREG(DISPC_CPR2_COEF_G);
+ DUMPREG(DISPC_CPR2_COEF_R);
+ DUMPREG(DISPC_DATA2_CYCLE1);
+ DUMPREG(DISPC_DATA2_CYCLE2);
+ DUMPREG(DISPC_DATA2_CYCLE3);
+ DUMPREG(DISPC_SIZE_LCD2);
+ DUMPREG(DISPC_TIMING_H2);
+ DUMPREG(DISPC_TIMING_V2);
+ DUMPREG(DISPC_POL_FREQ2);
+ DUMPREG(DISPC_DIVISOR2);
+ DUMPREG(DISPC_CONFIG2);
+ }
DUMPREG(DISPC_GFX_BA0);
DUMPREG(DISPC_GFX_BA1);
DUMPREG(DISPC_GFX_POSITION);
--
1.6.3.3
next prev parent reply other threads:[~2010-07-01 10:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 10:31 [RFC][PATCH 0/8] OMAP: DSS2: Overlay Manager LCD2 support in DISPC Archit Taneja
2010-07-01 10:31 ` [RFC][PATCH 1/8] OMAP: DSS2: Overlay Manager LCD2 changes in dispay.h Archit Taneja
2010-07-01 10:31 ` [PATCH] [RFC][PATCH 2/8] OMAP: DSS2: Add new Overlay Manager Archit Taneja
2010-07-01 10:31 ` [RFC][PATCH 3/8] OMAP: DSS2: Modify dss_recheck_connections Archit Taneja
2010-07-01 10:31 ` Archit Taneja [this message]
2010-07-01 10:31 ` [RFC][PATCH 5/8] OMAP: DSS2: Secondary LCD Channel in DISPC functions Archit Taneja
2010-07-01 10:31 ` [PATCH] [RFC][PATCH 6/8] OMAP: DSS2: Secondary LCD Channel DISPC IRQs Archit Taneja
2010-07-01 10:31 ` [RFC][PATCH 7/8] OMAP: DSS2: Context Save and Restore of DISPC registers for Secondary LCD Archit Taneja
2010-07-01 10:31 ` [PATCH] [PATCH] [RFC][PATCH 8/8] OMAP: DSS2: Interface driver changes for Secondary LCD Channel Archit Taneja
2010-07-01 11:30 ` [RFC][PATCH 4/8] OMAP: DSS2: OMAP4 Secondary LCD Channel DISPC Registers Tomi Valkeinen
2010-07-01 16:28 ` Paul Walmsley
2010-07-01 11:31 ` [RFC][PATCH 3/8] OMAP: DSS2: Modify dss_recheck_connections Tomi Valkeinen
2010-07-01 12:28 ` Taneja, Archit
2010-07-01 13:12 ` Tomi Valkeinen
2010-07-02 4:25 ` Taneja, Archit
2010-07-01 11:34 ` [PATCH] [RFC][PATCH 2/8] OMAP: DSS2: Add new Overlay Manager Tomi Valkeinen
2010-07-01 12:01 ` Taneja, Archit
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=1277980285-20996-5-git-send-email-archit@ti.com \
--to=archit@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=mmittal@ti.com \
--cc=samreen@ti.com \
--cc=sumit.semwal@ti.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;
as well as URLs for NNTP newsgroup(s).