drm/msm/dsi: Enable MMSS SPFB port via syscon

For DSIv2 to work, we need to enable MMSS_AHB_ARB_MASTER_PORT in
MMSS_SFPB. We enable the required bitfield by retrieving MMSS_SFPB
regmap pointer via syscon.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index bbf7f72058d7b1a1afb0834f5c83c3482b6f93cd..f61b88e91a8bc4b43c41a17ac2460d7ed5f7d2de 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -24,10 +24,13 @@
 #include <linux/of_graph.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spinlock.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
 #include <video/mipi_display.h>
 
 #include "dsi.h"
 #include "dsi.xml.h"
+#include "sfpb.xml.h"
 #include "dsi_cfg.h"
 
 static int dsi_get_version(const void __iomem *base, u32 *major, u32 *minor)
@@ -149,6 +152,8 @@ struct msm_dsi_host {
 
        u8 *rx_buf;
 
+       struct regmap *sfpb;
+
        struct drm_display_mode *mode;
 
        /* connected device info */
@@ -1568,6 +1573,16 @@ static int dsi_host_parse_dt(struct msm_dsi_host *msm_host)
 
        msm_host->device_node = device_node;
 
+       if (of_property_read_bool(np, "syscon-sfpb")) {
+               msm_host->sfpb = syscon_regmap_lookup_by_phandle(np,
+                                       "syscon-sfpb");
+               if (IS_ERR(msm_host->sfpb)) {
+                       dev_err(dev, "%s: failed to get sfpb regmap\n",
+                               __func__);
+                       return PTR_ERR(msm_host->sfpb);
+               }
+       }
+
        return 0;
 }
 
@@ -2031,6 +2046,20 @@ int msm_dsi_host_disable(struct mipi_dsi_host *host)
        return 0;
 }
 
+static void msm_dsi_sfpb_config(struct msm_dsi_host *msm_host, bool enable)
+{
+       enum sfpb_ahb_arb_master_port_en en;
+
+       if (!msm_host->sfpb)
+               return;
+
+       en = enable ? SFPB_MASTER_PORT_ENABLE : SFPB_MASTER_PORT_DISABLE;
+
+       regmap_update_bits(msm_host->sfpb, REG_SFPB_GPREG,
+                       SFPB_GPREG_MASTER_PORT_EN__MASK,
+                       SFPB_GPREG_MASTER_PORT_EN(en));
+}
+
 int msm_dsi_host_power_on(struct mipi_dsi_host *host)
 {
        struct msm_dsi_host *msm_host = to_msm_dsi_host(host);
@@ -2043,6 +2072,8 @@ int msm_dsi_host_power_on(struct mipi_dsi_host *host)
                goto unlock_ret;
        }
 
+       msm_dsi_sfpb_config(msm_host, true);
+
        ret = dsi_calc_clk_rate(msm_host);
        if (ret) {
                pr_err("%s: unable to calc clk rate, %d\n", __func__, ret);
@@ -2130,6 +2161,8 @@ int msm_dsi_host_power_off(struct mipi_dsi_host *host)
 
        dsi_host_regulator_disable(msm_host);
 
+       msm_dsi_sfpb_config(msm_host, false);
+
        DBG("-");
 
        msm_host->power_on = false;