drm/rockchip: dsi: add px30 support

Add the compatible and GRF definitions for the PX30 soc.

changes in v5:
- rebased on top of 5.5-rc1
- merged with dsi timing change to prevent ordering conflicts

Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191209143130.4553-7-heiko@sntech.de

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
index 17effcc..6e1270e 100644 (file)
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
@@ -140,6 +140,12 @@
 #define DW_MIPI_NEEDS_PHY_CFG_CLK      BIT(0)
 #define DW_MIPI_NEEDS_GRF_CLK          BIT(1)
 
+#define PX30_GRF_PD_VO_CON1            0x0438
+#define PX30_DSI_FORCETXSTOPMODE       (0xf << 7)
+#define PX30_DSI_FORCERXMODE           BIT(6)
+#define PX30_DSI_TURNDISABLE           BIT(5)
+#define PX30_DSI_LCDC_SEL              BIT(0)
+
 #define RK3288_GRF_SOC_CON6            0x025c
 #define RK3288_DSI0_LCDC_SEL           BIT(6)
 #define RK3288_DSI1_LCDC_SEL           BIT(9)
@@ -1127,6 +1133,24 @@ static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)
        return 0;
 }
 
+static const struct rockchip_dw_dsi_chip_data px30_chip_data[] = {
+       {
+               .reg = 0xff450000,
+               .lcdsel_grf_reg = PX30_GRF_PD_VO_CON1,
+               .lcdsel_big = HIWORD_UPDATE(0, PX30_DSI_LCDC_SEL),
+               .lcdsel_lit = HIWORD_UPDATE(PX30_DSI_LCDC_SEL,
+                                           PX30_DSI_LCDC_SEL),
+
+               .lanecfg1_grf_reg = PX30_GRF_PD_VO_CON1,
+               .lanecfg1 = HIWORD_UPDATE(0, PX30_DSI_TURNDISABLE |
+                                            PX30_DSI_FORCERXMODE |
+                                            PX30_DSI_FORCETXSTOPMODE),
+
+               .max_data_lanes = 4,
+       },
+       { /* sentinel */ }
+};
+
 static const struct rockchip_dw_dsi_chip_data rk3288_chip_data[] = {
        {
                .reg = 0xff960000,
@@ -1195,6 +1219,9 @@ static const struct rockchip_dw_dsi_chip_data rk3399_chip_data[] = {
 
 static const struct of_device_id dw_mipi_dsi_rockchip_dt_ids[] = {
        {
+        .compatible = "rockchip,px30-mipi-dsi",
+        .data = &px30_chip_data,
+       }, {
         .compatible = "rockchip,rk3288-mipi-dsi",
         .data = &rk3288_chip_data,
        }, {