drm: bridge: analogix_dp: rename RK3288_DP to ROCKCHIP_DP

Change-Id: I05adaad81ea1beabee1fa674bc00f4e044a58913
Signed-off-by: Yakir Yang <ykk@rock-chips.com>

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index e04b65d905d3b0099f40ae07c174d45b9e036f24..92804016a5cd1938fe61f1447eaf10f741fc7916 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1222,9 +1222,9 @@ static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp)
        struct video_info *video_info = &dp->video_info;
 
        switch (dp->plat_data->dev_type) {
-       case RK3288_DP:
+       case ROCKCHIP_DP:
                /*
-                * Like Rk3288 DisplayPort TRM indicate that "Main link
+                * Like ROCKCHIP DisplayPort TRM indicate that "Main link
                 * containing 4 physical lanes of 2.7/1.62 Gbps/lane".
                 */
                video_info->max_link_rate = 0x0A;

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
index 49205ef02be3afed044a2f58d4dce13f985278a2..931a76caf739f539ce1561c6f20136caafa86d76 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
@@ -74,7 +74,7 @@ void analogix_dp_init_analog_param(struct analogix_dp_device *dp)
        reg = SEL_24M | TX_DVDD_BIT_1_0625V;
        writel(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_2);
 
-       if (dp->plat_data && (dp->plat_data->dev_type == RK3288_DP)) {
+       if (dp->plat_data && (dp->plat_data->dev_type == ROCKCHIP_DP)) {
                writel(REF_CLK_24M, dp->reg_base + ANALOGIX_DP_PLL_REG_1);
                writel(0x95, dp->reg_base + ANALOGIX_DP_PLL_REG_2);
                writel(0x40, dp->reg_base + ANALOGIX_DP_PLL_REG_3);
@@ -244,7 +244,7 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,
        u32 reg;
        u32 phy_pd_addr = ANALOGIX_DP_PHY_PD;
 
-       if (dp->plat_data && (dp->plat_data->dev_type == RK3288_DP))
+       if (dp->plat_data && (dp->plat_data->dev_type == ROCKCHIP_DP))
                phy_pd_addr = ANALOGIX_DP_PD;
 
        switch (block) {
@@ -448,7 +448,7 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp)
        analogix_dp_reset_aux(dp);
 
        /* Disable AUX transaction H/W retry */
-       if (dp->plat_data && (dp->plat_data->dev_type == RK3288_DP))
+       if (dp->plat_data && (dp->plat_data->dev_type == ROCKCHIP_DP))
                reg = AUX_BIT_PERIOD_EXPECTED_DELAY(0) |
                      AUX_HW_RETRY_COUNT_SEL(3) |
                      AUX_HW_RETRY_INTERVAL_600_MICROSECONDS;

diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 6ea88d3e8c20136b0aa18ade2a147cdfc90ff39b..3a5fb13977e080904c5291b6262c77cabc2000c8 100644 (file)
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -103,7 +103,7 @@ rockchip_dp_mode_valid(struct analogix_dp_plat_data *plat_data,
        struct drm_display_info *di = &connector->display_info;
        struct rockchip_dp_device *dp = to_dp(plat_data);
 
-       if (dp->plat_data.dev_type == RK3288_DP) {
+       if (dp->plat_data.dev_type == ROCKCHIP_DP) {
                if (di->color_formats & DRM_COLOR_FORMAT_YCRCB444 ||
                    di->color_formats & DRM_COLOR_FORMAT_YCRCB422) {
                        di->color_formats &= ~(DRM_COLOR_FORMAT_YCRCB422 |
@@ -281,7 +281,7 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
 
        dp->plat_data.encoder = &dp->encoder;
 
-       dp->plat_data.dev_type = RK3288_DP;
+       dp->plat_data.dev_type = ROCKCHIP_DP;
        dp->plat_data.power_on = rockchip_dp_poweron;
        dp->plat_data.power_off = rockchip_dp_powerdown;
        dp->plat_data.mode_valid = rockchip_dp_mode_valid;

diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h
index da4800aa31ec7b9db04113171345cb2a20cb67ab..f5348e6a76a2a72798a9d48261546b88840fbc6c 100644 (file)
--- a/include/drm/bridge/analogix_dp.h
+++ b/include/drm/bridge/analogix_dp.h
@@ -15,7 +15,7 @@
 
 enum analogix_dp_devtype {
        EXYNOS_DP,
-       RK3288_DP,
+       ROCKCHIP_DP,
 };
 
 struct analogix_dp_plat_data {