mfd:rk616:lvds:fix LVDS_CON0 config bug

diff --git a/drivers/video/display/transmitter/rk616_lvds.c b/drivers/video/display/transmitter/rk616_lvds.c
index 3e0c6eccea04f1eb72004a59d337caaa7974231b..6debbce843b81cdbf3ce6f3b2586707eb5146c27 100644 (file)
--- a/drivers/video/display/transmitter/rk616_lvds.c
+++ b/drivers/video/display/transmitter/rk616_lvds.c
@@ -423,14 +423,17 @@ static int rk616_display_router_cfg(struct mfd_rk616 *rk616,rk_screen *screen)
                        }
                        else //single lvds channel
                        {
+                               val = 0;
                                val &= ~(LVDS_CH0TTL_EN | LVDS_CH1TTL_EN | LVDS_CH1_PWR_EN | LVDS_PLL_PWR_DN | LVDS_CH_SEL); //use channel 0
                                val |= (LVDS_CH0_PWR_EN) |(LVDS_CBG_PWR_EN) | (LVDS_OUT_FORMAT(screen->hw_format)) | 
-                                       (LVDS_CH0TTL_EN << 16) | (LVDS_CH1TTL_EN << 16) |(LVDS_CH0_PWR_EN << 16) | 
-                                       (LVDS_CBG_PWR_EN << 16)|(LVDS_CH_SEL << 16) | (LVDS_PLL_PWR_DN << 16)| 
-                                       (LVDS_OUT_FORMAT_MASK);
+                                     (LVDS_CH0TTL_EN << 16) | (LVDS_CH1TTL_EN << 16) |(LVDS_CH0_PWR_EN << 16) | 
+                                      (LVDS_DCLK_INV ) | (LVDS_CH0TTL_EN << 16) | (LVDS_CH1TTL_EN << 16) |(LVDS_CH0_PWR_EN << 16) | 
+                                       (LVDS_CBG_PWR_EN << 16)|(LVDS_CH_SEL << 16) | (LVDS_PLL_PWR_DN << 16)| 
+                                      (LVDS_OUT_FORMAT_MASK) | (LVDS_DCLK_INV << 16);
                                ret = rk616->write_dev(rk616,CRU_LVDS_CON0,&val);
-                               
+
                                dev_info(rk616->dev,"rk616 use single lvds channel.......\n");
+                               
                        }
 
                }

diff --git a/include/linux/mfd/rk616.h b/include/linux/mfd/rk616.h
index 206eba5b75e5130e08e476979cf7b2e18d08a5fb..6832956f9b04f213432210615b68973e1d54ecda 100644 (file)
--- a/include/linux/mfd/rk616.h
+++ b/include/linux/mfd/rk616.h
@@ -71,7 +71,12 @@
 #define VIF1_CLK_DIV_MASK      (7<<25)
 #define VIF0_CLK_DIV_MASK      (7<<19)
 #define SCLIN_CLK_SEL          (1<<15)
+#define SCL_SEL_VIF0           0
+#define SCL_SEL_VIF1           1
 #define DITHER_CLK_SEL         (1<<14)
+#define DITHER_SEL_VIF0                0
+#define DITHER_SEL_SCL         1
+
 #define HDMI_CLK_SEL(x)                (((x)&3)<<12)
 #define VIF1_CLK_DIV(x)        (((x)&7)<<9)
 #define VIF1_CLK_GATE          (1<<8)
@@ -127,7 +132,7 @@
 #define PLL1_FOUTVCO_PWR_DN    (1<<26)
 #define PLL1_POSTDIV_PWR_DN    (1<<25)
 #define PLL1_DAC_PWR_DN                (1<<24)
-#define PLL1_FRAC(x)           (((x)&0xffffff)<0)
+#define PLL1_FRAC(x)           (((x)&0xffffff)<<0)
 
 #define CRU_I2C_CON0           0x0080