One of the ports of RK3568 can be configured as LVDS, re-using the DSI DPHY

Signed-off-by: Alibek Omarov <a1ba.oma...@gmail.com>
---
 drivers/gpu/drm/rockchip/rockchip_lvds.c | 144 +++++++++++++++++++++--
 drivers/gpu/drm/rockchip/rockchip_lvds.h |  10 ++
 2 files changed, 147 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c 
b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index 68f6ebb33460..83c60240af85 100644
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -433,6 +433,90 @@ static void px30_lvds_encoder_disable(struct drm_encoder 
*encoder)
        drm_panel_unprepare(lvds->panel);
 }
 
+static int rk3568_lvds_poweron(struct rockchip_lvds *lvds)
+{
+       int ret;
+
+       ret = clk_enable(lvds->pclk);
+       if (ret < 0) {
+               DRM_DEV_ERROR(lvds->dev, "failed to enable lvds pclk %d\n", 
ret);
+               return ret;
+       }
+
+       ret = pm_runtime_get_sync(lvds->dev);
+       if (ret < 0) {
+               DRM_DEV_ERROR(lvds->dev, "failed to get pm runtime: %d\n", ret);
+               clk_disable(lvds->pclk);
+               return ret;
+       }
+
+       /* Enable LVDS mode */
+       return regmap_update_bits(lvds->grf, RK3568_GRF_VO_CON2,
+                                 RK3568_LVDS0_MODE_EN(1),
+                                 RK3568_LVDS0_MODE_EN(1));
+}
+
+static void rk3568_lvds_poweroff(struct rockchip_lvds *lvds)
+{
+       regmap_update_bits(lvds->grf, RK3568_GRF_VO_CON2,
+                          RK3568_LVDS0_MODE_EN(1) | RK3568_LVDS0_P2S_EN(1),
+                          RK3568_LVDS0_MODE_EN(0) | RK3568_LVDS0_P2S_EN(0));
+
+       pm_runtime_put(lvds->dev);
+       clk_disable(lvds->pclk);
+}
+
+static int rk3568_lvds_grf_config(struct drm_encoder *encoder,
+                               struct drm_display_mode *mode)
+{
+       struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
+
+       if (lvds->output != DISPLAY_OUTPUT_LVDS) {
+               DRM_DEV_ERROR(lvds->dev, "Unsupported display output %d\n",
+                             lvds->output);
+               return -EINVAL;
+       }
+
+       /* Set format */
+       return regmap_update_bits(lvds->grf, RK3568_GRF_VO_CON0,
+                                 RK3568_LVDS0_SELECT(3),
+                                 RK3568_LVDS0_SELECT(lvds->format));
+}
+
+static void rk3568_lvds_encoder_enable(struct drm_encoder *encoder)
+{
+       struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
+       struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
+       int ret;
+
+       drm_panel_prepare(lvds->panel);
+
+       ret = rk3568_lvds_poweron(lvds);
+       if (ret) {
+               DRM_DEV_ERROR(lvds->dev, "failed to power on LVDS: %d\n", ret);
+               drm_panel_unprepare(lvds->panel);
+               return;
+       }
+
+       ret = rk3568_lvds_grf_config(encoder, mode);
+       if (ret) {
+               DRM_DEV_ERROR(lvds->dev, "failed to configure LVDS: %d\n", ret);
+               drm_panel_unprepare(lvds->panel);
+               return;
+       }
+
+       drm_panel_enable(lvds->panel);
+}
+
+static void rk3568_lvds_encoder_disable(struct drm_encoder *encoder)
+{
+       struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
+
+       drm_panel_disable(lvds->panel);
+       rk3568_lvds_poweroff(lvds);
+       drm_panel_unprepare(lvds->panel);
+}
+
 static const
 struct drm_encoder_helper_funcs rk3288_lvds_encoder_helper_funcs = {
        .enable = rk3288_lvds_encoder_enable,
@@ -447,6 +531,13 @@ struct drm_encoder_helper_funcs 
px30_lvds_encoder_helper_funcs = {
        .atomic_check = rockchip_lvds_encoder_atomic_check,
 };
 
+static const
+struct drm_encoder_helper_funcs rk3568_lvds_encoder_helper_funcs = {
+       .enable = rk3568_lvds_encoder_enable,
+       .disable = rk3568_lvds_encoder_disable,
+       .atomic_check = rockchip_lvds_encoder_atomic_check,
+};
+
 static int rk3288_lvds_probe(struct platform_device *pdev,
                             struct rockchip_lvds *lvds)
 {
@@ -491,6 +582,26 @@ static int rk3288_lvds_probe(struct platform_device *pdev,
        return 0;
 }
 
+static int rockchip_lvds_phy_probe(struct platform_device *pdev,
+                                  struct rockchip_lvds *lvds)
+{
+       int ret;
+
+       lvds->dphy = devm_phy_get(&pdev->dev, "dphy");
+       if (IS_ERR(lvds->dphy))
+               return PTR_ERR(lvds->dphy);
+
+       ret = phy_init(lvds->dphy);
+       if (ret)
+               return ret;
+
+       ret = phy_set_mode(lvds->dphy, PHY_MODE_LVDS);
+       if (ret)
+               return ret;
+
+       return phy_power_on(lvds->dphy);
+}
+
 static int px30_lvds_probe(struct platform_device *pdev,
                           struct rockchip_lvds *lvds)
 {
@@ -503,20 +614,28 @@ static int px30_lvds_probe(struct platform_device *pdev,
        if (ret)
                return ret;
 
-       /* PHY */
-       lvds->dphy = devm_phy_get(&pdev->dev, "dphy");
-       if (IS_ERR(lvds->dphy))
-               return PTR_ERR(lvds->dphy);
+       return rockchip_lvds_phy_probe(pdev, lvds);
+}
 
-       ret = phy_init(lvds->dphy);
+static int rk3568_lvds_probe(struct platform_device *pdev,
+                            struct rockchip_lvds *lvds)
+{
+       int ret;
+
+       ret = regmap_update_bits(lvds->grf, RK3568_GRF_VO_CON0,
+                                 RK3568_LVDS0_MSBSEL(1),
+                                 RK3568_LVDS0_MSBSEL(1));
        if (ret)
                return ret;
 
-       ret = phy_set_mode(lvds->dphy, PHY_MODE_LVDS);
+       ret = regmap_update_bits(lvds->grf, RK3568_GRF_VO_CON2,
+                                RK3568_LVDS0_P2S_EN(1),
+                                RK3568_LVDS0_P2S_EN(1));
+
        if (ret)
                return ret;
 
-       return phy_power_on(lvds->dphy);
+       return rockchip_lvds_phy_probe(pdev, lvds);
 }
 
 static const struct rockchip_lvds_soc_data rk3288_lvds_data = {
@@ -529,6 +648,11 @@ static const struct rockchip_lvds_soc_data px30_lvds_data 
= {
        .helper_funcs = &px30_lvds_encoder_helper_funcs,
 };
 
+static const struct rockchip_lvds_soc_data rk3568_lvds_data = {
+       .probe = rk3568_lvds_probe,
+       .helper_funcs = &rk3568_lvds_encoder_helper_funcs,
+};
+
 static const struct of_device_id rockchip_lvds_dt_ids[] = {
        {
                .compatible = "rockchip,rk3288-lvds",
@@ -538,6 +662,10 @@ static const struct of_device_id rockchip_lvds_dt_ids[] = {
                .compatible = "rockchip,px30-lvds",
                .data = &px30_lvds_data
        },
+       {
+               .compatible = "rockchip,rk3568-lvds",
+               .data = &rk3568_lvds_data
+       },
        {}
 };
 MODULE_DEVICE_TABLE(of, rockchip_lvds_dt_ids);
@@ -612,6 +740,8 @@ static int rockchip_lvds_bind(struct device *dev, struct 
device *master,
        encoder = &lvds->encoder.encoder;
        encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
                                                             dev->of_node);
+       rockchip_drm_encoder_set_crtc_endpoint_id(&lvds->encoder,
+                                                 dev->of_node, 0, 0);
 
        ret = drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_LVDS);
        if (ret < 0) {
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.h 
b/drivers/gpu/drm/rockchip/rockchip_lvds.h
index 4ce967d23813..57decb33f779 100644
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.h
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.h
@@ -120,4 +120,14 @@
 #define   PX30_LVDS_P2S_EN(val)                        HIWORD_UPDATE(val,  6,  
6)
 #define   PX30_LVDS_VOP_SEL(val)               HIWORD_UPDATE(val,  1,  1)
 
+#define RK3568_GRF_VO_CON0                     0x0360
+#define   RK3568_LVDS0_SELECT(val)             HIWORD_UPDATE(val,  5,  4)
+#define   RK3568_LVDS0_MSBSEL(val)             HIWORD_UPDATE(val,  3,  3)
+
+#define RK3568_GRF_VO_CON2                     0x0368
+#define   RK3568_LVDS0_DCLK_INV_SEL(val)       HIWORD_UPDATE(val,  9,  9)
+#define   RK3568_LVDS0_DCLK_DIV2_SEL(val)      HIWORD_UPDATE(val,  8,  8)
+#define   RK3568_LVDS0_MODE_EN(val)            HIWORD_UPDATE(val,  1,  1)
+#define   RK3568_LVDS0_P2S_EN(val)             HIWORD_UPDATE(val,  0,  0)
+
 #endif /* _ROCKCHIP_LVDS_ */
-- 
2.34.1

Reply via email to