From bd577027f60f1aa6fce59d8e556113d100f60b85 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Thu, 24 Jun 2021 19:41:08 +0800 Subject: [PATCH] drm/rockchip/rk628: use stand PHY_MODE definition Switch from rockchip defined PHY_MODE_VIDEO_xx to stand PHY_MODE_xx Signed-off-by: Andy Yan Change-Id: Id04fd6eba6438a41679044d1998cfb207aad02ca --- drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c | 8 ++++---- drivers/gpu/drm/rockchip/rk628/rk628_dsi.c | 2 +- drivers/gpu/drm/rockchip/rk628/rk628_lvds.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c index 42131f0455f2..1b29b24fd0f6 100644 --- a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c @@ -239,12 +239,12 @@ static int rk628_combtxphy_power_on(struct phy *phy) SW_TX_IDLE(0x3ff) | SW_TX_PD(0x3ff) | SW_PD_PLL); switch (combtxphy->mode) { - case PHY_MODE_VIDEO_MIPI: + case PHY_MODE_MIPI_DPHY: regmap_update_bits(combtxphy->grf, GRF_POST_PROC_CON, SW_TXPHY_REFCLK_SEL_MASK, SW_TXPHY_REFCLK_SEL(0)); return rk628_combtxphy_dsi_power_on(combtxphy); - case PHY_MODE_VIDEO_LVDS: + case PHY_MODE_LVDS: regmap_update_bits(combtxphy->grf, GRF_POST_PROC_CON, SW_TXPHY_REFCLK_SEL_MASK, SW_TXPHY_REFCLK_SEL(1)); @@ -283,7 +283,7 @@ static int rk628_combtxphy_set_mode(struct phy *phy, enum phy_mode mode) unsigned long fvco, fpfd; switch (mode) { - case PHY_MODE_VIDEO_MIPI: + case PHY_MODE_MIPI_DPHY: { unsigned int fhsc = bus_width >> 8; unsigned int flags = bus_width & 0xff; @@ -321,7 +321,7 @@ static int rk628_combtxphy_set_mode(struct phy *phy, enum phy_mode mode) phy_set_bus_width(phy, fhsc); break; } - case PHY_MODE_VIDEO_LVDS: + case PHY_MODE_LVDS: { unsigned int flags = bus_width & 0xff; unsigned int rate = (bus_width >> 8) * 7; diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c index 296b19a5924a..37d4df171426 100644 --- a/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c +++ b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c @@ -1121,7 +1121,7 @@ static void rk628_dsi_bridge_enable(struct drm_bridge *bridge) bus_width |= COMBTXPHY_MODULEA_EN; phy_set_bus_width(dsi->phy, bus_width); - ret = phy_set_mode(dsi->phy, PHY_MODE_VIDEO_MIPI); + ret = phy_set_mode(dsi->phy, PHY_MODE_MIPI_DPHY); if (ret) { dev_err(dsi->dev, "failed to set phy mode: %d\n", ret); return; diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c index 33330d8e197e..848b6ed8e0f1 100644 --- a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c +++ b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c @@ -193,7 +193,7 @@ static void rk628_lvds_bridge_enable(struct drm_bridge *bridge) bus_width |= (mode->clock / 1000) << 8; phy_set_bus_width(lvds->phy, bus_width); - ret = phy_set_mode(lvds->phy, PHY_MODE_VIDEO_LVDS); + ret = phy_set_mode(lvds->phy, PHY_MODE_LVDS); if (ret) { dev_err(lvds->dev, "failed to set phy mode: %d\n", ret); return;