diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2010-10-07 13:27:42 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-05-11 14:20:15 +0300 |
| commit | c335cbf94e7450fb41aafe97e805752a830d3a43 (patch) | |
| tree | 14a169efcd42d6255e959b5fbad7d82a7c794201 /drivers/video | |
| parent | 293ef19cbb9ef403b6dc9c96e34096bac5c88b84 (diff) | |
| download | linux-c335cbf94e7450fb41aafe97e805752a830d3a43.tar.gz linux-c335cbf94e7450fb41aafe97e805752a830d3a43.tar.bz2 linux-c335cbf94e7450fb41aafe97e805752a830d3a43.zip | |
OMAP: DSS2: DSI: fix _dsi_print_reset_status
The bits for TXCLKESCx reset have changed for OMAP3630 and OMAP4.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 9c5155bcd22d..186a228f9f24 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -960,6 +960,7 @@ static inline void dsi_enable_pll_clock(bool enable) static void _dsi_print_reset_status(void) { u32 l; + int b0, b1, b2; if (!dss_debug) return; @@ -977,9 +978,21 @@ static void _dsi_print_reset_status(void) l = dsi_read_reg(DSI_COMPLEXIO_CFG1); printk("CIO (%d) ", FLD_GET(l, 29, 29)); + if (dss_has_feature(FEAT_DSI_REVERSE_TXCLKESC)) { + b0 = 28; + b1 = 27; + b2 = 26; + } else { + b0 = 24; + b1 = 25; + b2 = 26; + } + l = dsi_read_reg(DSI_DSIPHY_CFG5); - printk("PHY (%x, %d, %d, %d)\n", - FLD_GET(l, 28, 26), + printk("PHY (%x%x%x, %d, %d, %d)\n", + FLD_GET(l, b0, b0), + FLD_GET(l, b1, b1), + FLD_GET(l, b2, b2), FLD_GET(l, 29, 29), FLD_GET(l, 30, 30), FLD_GET(l, 31, 31)); |