Merge branch 'for-paul-39-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-fixes-for-linus

5 files changed, 25 insertions, 12 deletions

diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index d18ad6b2372a..609a28073178 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -3,6 +3,7 @@ menu "OMAP2/3 Display Device Drivers"
 
 config PANEL_GENERIC_DPI
         tristate "Generic DPI Panel"
+        depends on OMAP2_DSS_DPI
         help
           Generic DPI panel driver.
           Supports DVI output for Beagle and OMAP3 SDP.
@@ -11,20 +12,20 @@ config PANEL_GENERIC_DPI
 
 config PANEL_LGPHILIPS_LB035Q02
         tristate "LG.Philips LB035Q02 LCD Panel"
-        depends on OMAP2_DSS && SPI
+        depends on OMAP2_DSS_DPI && SPI
         help
           LCD Panel used on the Gumstix Overo Palo35
 
 config PANEL_SHARP_LS037V7DW01
         tristate "Sharp LS037V7DW01 LCD Panel"
-        depends on OMAP2_DSS
+        depends on OMAP2_DSS_DPI
         select BACKLIGHT_CLASS_DEVICE
         help
           LCD Panel used in TI's SDP3430 and EVM boards
 
 config PANEL_NEC_NL8048HL11_01B
         tristate "NEC NL8048HL11-01B Panel"
-        depends on OMAP2_DSS
+        depends on OMAP2_DSS_DPI
         help
                 This NEC NL8048HL11-01B panel is TFT LCD
                 used in the Zoom2/3/3630 sdp boards.
@@ -37,7 +38,7 @@ config PANEL_TAAL
 
 config PANEL_TPO_TD043MTEA1
         tristate "TPO TD043MTEA1 LCD Panel"
-        depends on OMAP2_DSS && SPI
+        depends on OMAP2_DSS_DPI && SPI
         help
           LCD Panel used in OMAP3 Pandora
 
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 0a7f1a47f8e3..cbd9ca48d6ec 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -1059,6 +1059,11 @@ static int dsi_pll_power(enum dsi_pll_power_state state)
 {
         int t = 0;
 
+        /* DSI-PLL power command 0x3 is not working */
+        if (dss_has_feature(FEAT_DSI_PLL_PWR_BUG) &&
+                        state == DSI_PLL_POWER_ON_DIV)
+                state = DSI_PLL_POWER_ON_ALL;
+
         REG_FLD_MOD(DSI_CLK_CTRL, state, 31, 30);       /* PLL_PWR_CMD */
 
         /* PLL_PWR_STATUS */
@@ -1276,6 +1281,9 @@ int dsi_pll_set_clock_div(struct dsi_clock_info *cinfo)
 
         DSSDBGF();
 
+        dsi.current_cinfo.use_sys_clk = cinfo->use_sys_clk;
+        dsi.current_cinfo.highfreq = cinfo->highfreq;
+
         dsi.current_cinfo.fint = cinfo->fint;
         dsi.current_cinfo.clkin4ddr = cinfo->clkin4ddr;
         dsi.current_cinfo.dsi_pll_hsdiv_dispc_clk =
@@ -1488,7 +1496,6 @@ void dsi_pll_uninit(void)
 
 void dsi_dump_clocks(struct seq_file *s)
 {
-        int clksel;
         struct dsi_clock_info *cinfo = &dsi.current_cinfo;
         enum dss_clk_source dispc_clk_src, dsi_clk_src;
 
@@ -1497,13 +1504,10 @@ void dsi_dump_clocks(struct seq_file *s)
 
         enable_clocks(1);
 
-        clksel = REG_GET(DSI_PLL_CONFIGURATION2, 11, 11);
-
         seq_printf(s,   "- DSI PLL -\n");
 
         seq_printf(s,   "dsi pll source = %s\n",
-                        clksel == 0 ?
-                        "dss_sys_clk" : "pclkfree");
+                        cinfo->use_sys_clk ? "dss_sys_clk" : "pclkfree");
 
         seq_printf(s,   "Fint\t\t%-16luregn %u\n", cinfo->fint, cinfo->regn);
 
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 3f1fee63c678..c3b48a0fcf35 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -385,8 +385,14 @@ enum dss_clk_source dss_get_dsi_clk_source(void)
 
 enum dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel)
 {
-        int ix = channel == OMAP_DSS_CHANNEL_LCD ? 0 : 1;
-        return dss.lcd_clk_source[ix];
+        if (dss_has_feature(FEAT_LCD_CLK_SRC)) {
+                int ix = channel == OMAP_DSS_CHANNEL_LCD ? 0 : 1;
+                return dss.lcd_clk_source[ix];
+        } else {
+                /* LCD_CLK source is the same as DISPC_FCLK source for
+                 * OMAP2 and OMAP3 */
+                return dss.dispc_clk_source;
+        }
 }
 
 /* calculate clock rates using dividers in cinfo */
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index aa1622241d0d..8c50e18bc0b0 100644
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -271,7 +271,7 @@ static struct omap_dss_features omap3630_dss_features = {
                 FEAT_LCDENABLESIGNAL | FEAT_PCKFREEENABLE |
                 FEAT_PRE_MULT_ALPHA | FEAT_FUNCGATED |
                 FEAT_ROWREPEATENABLE | FEAT_LINEBUFFERSPLIT |
-                FEAT_RESIZECONF,
+                FEAT_RESIZECONF | FEAT_DSI_PLL_PWR_BUG,
 
         .num_mgrs = 2,
         .num_ovls = 3,
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index 12e9c4ef0dec..37922ce6b8b1 100644
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -40,6 +40,8 @@ enum dss_feat_id {
         /* Independent core clk divider */
         FEAT_CORE_CLK_DIV       = 1 << 11,
         FEAT_LCD_CLK_SRC        = 1 << 12,
+        /* DSI-PLL power command 0x3 is not working */
+        FEAT_DSI_PLL_PWR_BUG    = 1 << 13,
 };
 
 /* DSS register field id */