regmap has special API to enable the controller bus clock while
initializing register space, and current driver is using
devm_regmap_init_mmio_clk which require to specify bus
clk_id argument as "bus"

But, the usage of clocks are varies between different Allwinner
DSI controllers. Clocking in A33 would need bus and mod clocks
where as A64 would need only bus clock.

Since A64 support only single bus clock, it is optional to
specify the clock-names on the controller device tree node.
So using NULL on clk_id would get the attached clock.

To support clk_id as "bus" and "NULL" during clock enablement
between controllers, this patch add generic code to handle
the bus clock using regmap_mmio_attach_clk with associated
regmap APIs.

Signed-off-by: Jagan Teki <ja...@amarulasolutions.com>
---
Changes for v12:
- get bus clock only when mod clock present
- use regmap_mmio_attach_clk

 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 43 +++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c 
b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
index 8c4c541224dd..6085ad2eafc3 100644
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -1082,6 +1082,7 @@ static const struct component_ops sun6i_dsi_ops = {
 static int sun6i_dsi_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
+       const char *clk_name = NULL;
        struct sun6i_dsi *dsi;
        struct resource *res;
        void __iomem *base;
@@ -1095,6 +1096,8 @@ static int sun6i_dsi_probe(struct platform_device *pdev)
        dsi->host.ops = &sun6i_dsi_host_ops;
        dsi->host.dev = dev;
        dsi->variant = of_device_get_match_data(dev);
+       if (dsi->variant->has_mod_clk)
+               clk_name = "bus";
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        base = devm_ioremap_resource(dev, res);
@@ -1109,24 +1112,35 @@ static int sun6i_dsi_probe(struct platform_device *pdev)
                return PTR_ERR(dsi->regulator);
        }
 
-       dsi->regs = devm_regmap_init_mmio_clk(dev, "bus", base,
-                                             &sun6i_dsi_regmap_config);
-       if (IS_ERR(dsi->regs)) {
-               dev_err(dev, "Couldn't create the DSI encoder regmap\n");
-               return PTR_ERR(dsi->regs);
-       }
-
        dsi->reset = devm_reset_control_get_shared(dev, NULL);
        if (IS_ERR(dsi->reset)) {
                dev_err(dev, "Couldn't get our reset line\n");
                return PTR_ERR(dsi->reset);
        }
 
+       dsi->regs = devm_regmap_init_mmio(dev, base, &sun6i_dsi_regmap_config);
+       if (IS_ERR(dsi->regs)) {
+               dev_err(dev, "Couldn't init regmap\n");
+               return PTR_ERR(dsi->regs);
+       }
+
+       dsi->bus_clk = devm_clk_get(dev, clk_name);
+       if (IS_ERR(dsi->bus_clk)) {
+               dev_err(dev, "Couldn't get the DSI bus clock\n");
+               ret = PTR_ERR(dsi->bus_clk);
+               goto err_regmap;
+       } else {
+               ret = regmap_mmio_attach_clk(dsi->regs, dsi->bus_clk);
+               if (ret)
+                       goto err_bus_clk;
+       }
+
        if (dsi->variant->has_mod_clk) {
                dsi->mod_clk = devm_clk_get(dev, "mod");
                if (IS_ERR(dsi->mod_clk)) {
                        dev_err(dev, "Couldn't get the DSI mod clock\n");
-                       return PTR_ERR(dsi->mod_clk);
+                       ret = PTR_ERR(dsi->mod_clk);
+                       goto err_attach_clk;
                }
        }
 
@@ -1167,6 +1181,14 @@ static int sun6i_dsi_probe(struct platform_device *pdev)
 err_unprotect_clk:
        if (dsi->variant->has_mod_clk)
                clk_rate_exclusive_put(dsi->mod_clk);
+err_attach_clk:
+       if (!IS_ERR(dsi->bus_clk))
+               regmap_mmio_detach_clk(dsi->regs);
+err_bus_clk:
+       if (!IS_ERR(dsi->bus_clk))
+               clk_put(dsi->bus_clk);
+err_regmap:
+       regmap_exit(dsi->regs);
        return ret;
 }
 
@@ -1181,6 +1203,11 @@ static int sun6i_dsi_remove(struct platform_device *pdev)
        if (dsi->variant->has_mod_clk)
                clk_rate_exclusive_put(dsi->mod_clk);
 
+       if (!IS_ERR(dsi->bus_clk))
+               regmap_mmio_detach_clk(dsi->regs);
+
+       regmap_exit(dsi->regs);
+
        return 0;
 }
 
-- 
2.18.0.321.gffc6fa0e3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to