BackMerge v4.19-rc5 into drm-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / sun4i / sun8i_hdmi_phy.c

diff --git a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
index a564b5dfe082839896833db50ffbabbcfbe014ee..471993097ceda3b3c35a29ab2ae681026e278d93 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
+++ b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
@@ -416,6 +416,14 @@ static const struct sun8i_hdmi_phy_variant sun8i_h3_hdmi_phy = {
        .phy_config = &sun8i_hdmi_phy_config_h3,
 };
 
+static const struct sun8i_hdmi_phy_variant sun8i_r40_hdmi_phy = {
+       .has_phy_clk = true,
+       .has_second_pll = true,
+       .phy_init = &sun8i_hdmi_phy_init_h3,
+       .phy_disable = &sun8i_hdmi_phy_disable_h3,
+       .phy_config = &sun8i_hdmi_phy_config_h3,
+};
+
 static const struct of_device_id sun8i_hdmi_phy_of_table[] = {
        {
                .compatible = "allwinner,sun50i-a64-hdmi-phy",
@@ -429,6 +437,10 @@ static const struct of_device_id sun8i_hdmi_phy_of_table[] = {
                .compatible = "allwinner,sun8i-h3-hdmi-phy",
                .data = &sun8i_h3_hdmi_phy,
        },
+       {
+               .compatible = "allwinner,sun8i-r40-hdmi-phy",
+               .data = &sun8i_r40_hdmi_phy,
+       },
        { /* sentinel */ }
 };