rk312x lvds： remove some unused code

diff --git a/drivers/video/rockchip/transmitter/rk31xx_lvds.c b/drivers/video/rockchip/transmitter/rk31xx_lvds.c
index 8bbb47bb15e8f3fb9f718b257e660b1970ab4106..ab21c8c8395d47c97c445da0d87064c5cec1e817 100755 (executable)
--- a/drivers/video/rockchip/transmitter/rk31xx_lvds.c
+++ b/drivers/video/rockchip/transmitter/rk31xx_lvds.c
@@ -1,5 +1,5 @@
 /*
- * drivers/video/rockchip/lcdc/rk31xx_lcdc.c
+ * drivers/video/rockchip/transmitter/rk31xx_lvds.c
  *
  * Copyright (C) 2014 ROCKCHIP, Inc.
  * Author: zhuangwenlong<zwl@rock-chips.com>
@@ -45,19 +45,13 @@ static int rk31xx_lvds_clk_init(struct rk_lvds_device *lvds)
                dev_err(lvds->dev, "get clk failed\n");
                return PTR_ERR(lvds->pclk);
        }
- 
-       lvds->pd = devm_clk_get(lvds->dev,"pd_lvds");
-       if (IS_ERR(lvds->pd)) {
-               dev_err(lvds->dev, "get clk failed\n");
-               return PTR_ERR(lvds->pd);
-       }       
+
        return 0;       
 }
 
 static int rk31xx_lvds_clk_enable(struct rk_lvds_device *lvds)
 {
        if (!lvds->clk_on) {
-               clk_prepare_enable(lvds->pd);
                clk_prepare_enable(lvds->pclk);
                lvds->clk_on = true;
        }
@@ -69,7 +63,6 @@ static int rk31xx_lvds_clk_disable(struct rk_lvds_device *lvds)
 {
        if (lvds->clk_on) {
                clk_disable_unprepare(lvds->pclk);
-               clk_disable_unprepare(lvds->pd);
                lvds->clk_on = false;
        }
 
@@ -138,7 +131,7 @@ static void rk31xx_output_lvds(struct rk_lvds_device *lvds,
          * set iomux in dts pinctrl
          */
        val = 0;
-       val |= v_LVDSMODE_EN(1) | v_MIPIPHY_TTL_EN(0);      /* enable lvds mode */
+       val |= v_LVDSMODE_EN(1) | v_MIPIPHY_TTL_EN(0);  /* enable lvds mode */
        val |= v_LVDS_DATA_SEL(LVDS_DATA_FROM_LCDC);    /* config data source */
        val |= v_LVDS_OUTPUT_FORMAT(screen->lvds_format); /* config lvds_format */
        val |= v_LVDS_MSBSEL(LVDS_MSB_D7);      /* LSB receive mode */
@@ -184,7 +177,7 @@ static void rk31xx_output_lvttl(struct rk_lvds_device *lvds,
         pinctrl_select_state(lvds->dev->pins->p, lcdc_state);
 #endif
 
-       val |= v_LVDSMODE_EN(0) | v_MIPIPHY_TTL_EN(1);      /* enable lvds mode */
+       val |= v_LVDSMODE_EN(0) | v_MIPIPHY_TTL_EN(1);  /* enable lvds mode */
        val |= v_LVDS_DATA_SEL(LVDS_DATA_FROM_LCDC);    /* config data source */
        grf_writel(val, RK312X_GRF_LVDS_CON0);
 

diff --git a/drivers/video/rockchip/transmitter/rk31xx_lvds.h b/drivers/video/rockchip/transmitter/rk31xx_lvds.h
index 560fa94347b6d93e866fe3a1b0aff97f17b60ce3..6aa20d98444df3a3865c98b03cf62922a0dbab99 100755 (executable)
--- a/drivers/video/rockchip/transmitter/rk31xx_lvds.h
+++ b/drivers/video/rockchip/transmitter/rk31xx_lvds.h
@@ -79,7 +79,6 @@ struct rk_lvds_device {
        struct device           *dev;
        void __iomem            *regbase;
        struct clk              *pclk;  /*phb clk*/
-       struct clk              *pd;
        struct rk_screen        screen;
        bool                    clk_on;
         bool                    sys_state;
@@ -101,7 +100,7 @@ static inline int lvds_msk_reg(struct rk_lvds_device *lvds, u32 offset,
        return 0;
 }
 
-static inline u32 hdmi_readl(struct rk_lvds_device *lvds, u32 offset)
+static inline u32 lvds_readl(struct rk_lvds_device *lvds, u32 offset)
 {
        return readl_relaxed(lvds->regbase + offset);
 }