Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
	drivers/video/omap2/dss/sdi.c

diff --cc drivers/video/omap2/dss/sdi.c
index f43bfe17b3b699289152cb9ff195afcb69f137f2,3bf1bfe2958536e2072c9a86ec8242a3ff0c56fe..2f0896f96f851faeb5e6d89648e97569a7b98e82
--- 1/drivers/video/omap2/dss/sdi.c
--- 2/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);
  
-       dss_sdi_init(dssdev->phy.sdi.datapairs);
 +      /*
 +       * 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(sdi.datapairs);
+ 
        r = dss_sdi_enable();
        if (r)
                goto err_sdi_enable;