drm/rockchip: dw_hdmi: Add support for rk3368

Change-Id: I6a49447a5edd53013ed81875f351089793914f77
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>

diff --git a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
index 5936883df121621f03ad7b3ecccbb609a03e845c..351c94be2dfa42dc416e7956c1eba3ce281c5fc0 100644 (file)
--- a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
+++ b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
@@ -3,6 +3,7 @@ Rockchip specific extensions to the Synopsys Designware HDMI
 
 Required properties:
 - compatible: "rockchip,rk3288-dw-hdmi",
+             "rockchip,rk3368-dw-hdmi",
              "rockchip,rk3399-dw-hdmi";
 - reg: Physical base address and length of the controller's registers.
 - clocks: phandle to hdmi iahb and isfr clocks.

diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c
index afbb6c83ac461789caf2f28089d7f1c83fa46e57..a76a3b1c6d3e11446f6f86485c9143dbfaba3080 100644 (file)
--- a/drivers/gpu/drm/bridge/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/dw-hdmi.c
@@ -1281,7 +1281,7 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep,
         * to enable mpll pre-divider.
         */
        if (hdmi->hdmi_data.enc_in_format == YCBCR420 &&
-           hdmi->dev_type == RK3399_HDMI)
+           (hdmi->dev_type == RK3399_HDMI || hdmi->dev_type == RK3368_HDMI))
                hdmi_phy_i2c_write(hdmi, mpll_config->res[res_idx].cpce | 4,
                                   0x06);
        else

diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 81af1747566b5111bdc96f53fef1905fafd12d2f..66a220005cbb328907eb122b081ca5390b61d3ba 100644 (file)
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -404,6 +404,14 @@ static const struct dw_hdmi_plat_data rk3288_hdmi_drv_data = {
        .tmds_n_table = rockchip_werid_tmds_n_table,
 };
 
+static const struct dw_hdmi_plat_data rk3368_hdmi_drv_data = {
+       .mode_valid = dw_hdmi_rockchip_mode_valid,
+       .mpll_cfg   = rockchip_mpll_cfg,
+       .cur_ctr    = rockchip_cur_ctr,
+       .phy_config = rockchip_phy_config,
+       .dev_type   = RK3368_HDMI,
+};
+
 static const struct dw_hdmi_plat_data rk3399_hdmi_drv_data = {
        .mode_valid = dw_hdmi_rockchip_mode_valid,
        .mpll_cfg   = rockchip_mpll_cfg,
@@ -416,6 +424,10 @@ static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = {
        { .compatible = "rockchip,rk3288-dw-hdmi",
          .data = &rk3288_hdmi_drv_data
        },
+       {
+        .compatible = "rockchip,rk3368-dw-hdmi",
+        .data = &rk3368_hdmi_drv_data
+       },
        { .compatible = "rockchip,rk3399-dw-hdmi",
          .data = &rk3399_hdmi_drv_data
        },

diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index f06e2be0c0e9f2044840d7474fd36abc3194ecbe..696b84994ae5462c12ea6d082fa87dca1df870cc 100644 (file)
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
@@ -25,6 +25,7 @@ enum dw_hdmi_devtype {
        IMX6Q_HDMI,
        IMX6DL_HDMI,
        RK3288_HDMI,
+       RK3368_HDMI,
        RK3399_HDMI,
 };
 
@@ -67,7 +68,14 @@ struct dw_hdmi_plat_data {
 
 static inline bool is_rockchip(enum dw_hdmi_devtype dev_type)
 {
-       return dev_type == RK3288_HDMI || dev_type == RK3399_HDMI;
+       switch (dev_type) {
+       case RK3288_HDMI:
+       case RK3368_HDMI:
+       case RK3399_HDMI:
+               return true;
+       default:
+               return false;
+       }
 }
 
 void dw_hdmi_unbind(struct device *dev, struct device *master, void *data);