drm/sun4i: Add support for H6 DW HDMI controller

[linux.git] / drivers / gpu / drm / sun4i / sun8i_dw_hdmi.c

diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
index 31875b636434a12337b597f6358fac37861c8303..445cca8d9a26b0b10f8c129fe87409d4e56bdb54 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
+++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
@@ -5,6 +5,7 @@
 
 #include <linux/component.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 
 #include <drm/drm_of.h>
@@ -20,7 +21,8 @@ static void sun8i_dw_hdmi_encoder_mode_set(struct drm_encoder *encoder,
 {
        struct sun8i_dw_hdmi *hdmi = encoder_to_sun8i_dw_hdmi(encoder);
 
-       clk_set_rate(hdmi->clk_tmds, mode->crtc_clock * 1000);
+       if (hdmi->quirks->set_rate)
+               clk_set_rate(hdmi->clk_tmds, mode->crtc_clock * 1000);
 }
 
 static const struct drm_encoder_helper_funcs
@@ -33,8 +35,8 @@ static const struct drm_encoder_funcs sun8i_dw_hdmi_encoder_funcs = {
 };
 
 static enum drm_mode_status
-sun8i_dw_hdmi_mode_valid(struct drm_connector *connector,
-                        const struct drm_display_mode *mode)
+sun8i_dw_hdmi_mode_valid_a83t(struct drm_connector *connector,
+                             const struct drm_display_mode *mode)
 {
        if (mode->clock > 297000)
                return MODE_CLOCK_HIGH;
@@ -42,6 +44,17 @@ sun8i_dw_hdmi_mode_valid(struct drm_connector *connector,
        return MODE_OK;
 }
 
+static enum drm_mode_status
+sun8i_dw_hdmi_mode_valid_h6(struct drm_connector *connector,
+                           const struct drm_display_mode *mode)
+{
+       /* This is max for HDMI 2.0b (4K@60Hz) */
+       if (mode->clock > 594000)
+               return MODE_CLOCK_HIGH;
+
+       return MODE_OK;
+}
+
 static bool sun8i_dw_hdmi_node_is_tcon_top(struct device_node *node)
 {
        return IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP) &&
@@ -102,6 +115,8 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
        hdmi->dev = &pdev->dev;
        encoder = &hdmi->encoder;
 
+       hdmi->quirks = of_device_get_match_data(dev);
+
        encoder->possible_crtcs =
                sun8i_dw_hdmi_find_possible_crtcs(drm, dev->of_node);
        /*
@@ -125,10 +140,22 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
                return PTR_ERR(hdmi->clk_tmds);
        }
 
+       hdmi->regulator = devm_regulator_get(dev, "hvcc");
+       if (IS_ERR(hdmi->regulator)) {
+               dev_err(dev, "Couldn't get regulator\n");
+               return PTR_ERR(hdmi->regulator);
+       }
+
+       ret = regulator_enable(hdmi->regulator);
+       if (ret) {
+               dev_err(dev, "Failed to enable regulator\n");
+               return ret;
+       }
+
        ret = reset_control_deassert(hdmi->rst_ctrl);
        if (ret) {
                dev_err(dev, "Could not deassert ctrl reset control\n");
-               return ret;
+               goto err_disable_regulator;
        }
 
        ret = clk_prepare_enable(hdmi->clk_tmds);
@@ -156,7 +183,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
 
        sun8i_hdmi_phy_init(hdmi->phy);
 
-       plat_data->mode_valid = &sun8i_dw_hdmi_mode_valid;
+       plat_data->mode_valid = hdmi->quirks->mode_valid;
        plat_data->phy_ops = sun8i_hdmi_phy_get_ops();
        plat_data->phy_name = "sun8i_dw_hdmi_phy";
        plat_data->phy_data = hdmi->phy;
@@ -183,6 +210,8 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
        clk_disable_unprepare(hdmi->clk_tmds);
 err_assert_ctrl_reset:
        reset_control_assert(hdmi->rst_ctrl);
+err_disable_regulator:
+       regulator_disable(hdmi->regulator);
 
        return ret;
 }
@@ -196,6 +225,7 @@ static void sun8i_dw_hdmi_unbind(struct device *dev, struct device *master,
        sun8i_hdmi_phy_remove(hdmi);
        clk_disable_unprepare(hdmi->clk_tmds);
        reset_control_assert(hdmi->rst_ctrl);
+       regulator_disable(hdmi->regulator);
 }
 
 static const struct component_ops sun8i_dw_hdmi_ops = {
@@ -215,8 +245,24 @@ static int sun8i_dw_hdmi_remove(struct platform_device *pdev)
        return 0;
 }
 
+static const struct sun8i_dw_hdmi_quirks sun8i_a83t_quirks = {
+       .mode_valid = sun8i_dw_hdmi_mode_valid_a83t,
+       .set_rate = true,
+};
+
+static const struct sun8i_dw_hdmi_quirks sun50i_h6_quirks = {
+       .mode_valid = sun8i_dw_hdmi_mode_valid_h6,
+};
+
 static const struct of_device_id sun8i_dw_hdmi_dt_ids[] = {
-       { .compatible = "allwinner,sun8i-a83t-dw-hdmi" },
+       {
+               .compatible = "allwinner,sun8i-a83t-dw-hdmi",
+               .data = &sun8i_a83t_quirks,
+       },
+       {
+               .compatible = "allwinner,sun50i-h6-dw-hdmi",
+               .data = &sun50i_h6_quirks,
+       },
        { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, sun8i_dw_hdmi_dt_ids);