diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2010-10-07 06:27:42 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-05-11 07:20:15 -0400 |
commit | c335cbf94e7450fb41aafe97e805752a830d3a43 (patch) | |
tree | 14a169efcd42d6255e959b5fbad7d82a7c794201 /drivers/video/omap2/dss/dsi.c | |
parent | 293ef19cbb9ef403b6dc9c96e34096bac5c88b84 (diff) |
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/omap2/dss/dsi.c')
-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 9c5155bcd22..186a228f9f2 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) | |||
960 | static void _dsi_print_reset_status(void) | 960 | static void _dsi_print_reset_status(void) |
961 | { | 961 | { |
962 | u32 l; | 962 | u32 l; |
963 | int b0, b1, b2; | ||
963 | 964 | ||
964 | if (!dss_debug) | 965 | if (!dss_debug) |
965 | return; | 966 | return; |
@@ -977,9 +978,21 @@ static void _dsi_print_reset_status(void) | |||
977 | l = dsi_read_reg(DSI_COMPLEXIO_CFG1); | 978 | l = dsi_read_reg(DSI_COMPLEXIO_CFG1); |
978 | printk("CIO (%d) ", FLD_GET(l, 29, 29)); | 979 | printk("CIO (%d) ", FLD_GET(l, 29, 29)); |
979 | 980 | ||
981 | if (dss_has_feature(FEAT_DSI_REVERSE_TXCLKESC)) { | ||
982 | b0 = 28; | ||
983 | b1 = 27; | ||
984 | b2 = 26; | ||
985 | } else { | ||
986 | b0 = 24; | ||
987 | b1 = 25; | ||
988 | b2 = 26; | ||
989 | } | ||
990 | |||
980 | l = dsi_read_reg(DSI_DSIPHY_CFG5); | 991 | l = dsi_read_reg(DSI_DSIPHY_CFG5); |
981 | printk("PHY (%x, %d, %d, %d)\n", | 992 | printk("PHY (%x%x%x, %d, %d, %d)\n", |
982 | FLD_GET(l, 28, 26), | 993 | FLD_GET(l, b0, b0), |
994 | FLD_GET(l, b1, b1), | ||
995 | FLD_GET(l, b2, b2), | ||
983 | FLD_GET(l, 29, 29), | 996 | FLD_GET(l, 29, 29), |
984 | FLD_GET(l, 30, 30), | 997 | FLD_GET(l, 30, 30), |
985 | FLD_GET(l, 31, 31)); | 998 | FLD_GET(l, 31, 31)); |