usb: dwc3: exynos: Rework clock handling and prepare for new variants

Add per-variant list of clocks and manage them all together in
the single array. This is a preparation for adding new variants
of Exynos SoCs. No functional changes for existing Exynos SoCs.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ib8f4c93445f88b82d08fe9e49aac60f465a44a3f

diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index 1b71485..847ad0a 100644 (file)
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -25,12 +25,21 @@
 #include <linux/of_platform.h>
 #include <linux/regulator/consumer.h>
 
+#define DWC3_EXYNOS_MAX_CLOCKS 4
+
+struct dwc3_exynos_driverdata {
+       const char              *clk_names[DWC3_EXYNOS_MAX_CLOCKS];
+       int                     num_clks;
+       int                     suspend_clk_idx;
+};
+
 struct dwc3_exynos {
        struct device           *dev;
 
-       struct clk              *clk;
-       struct clk              *susp_clk;
-       struct clk              *axius_clk;
+       const char              **clk_names;
+       struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
+       int                     num_clks;
+       int                     suspend_clk_idx;
 
        struct regulator        *vdd33;
        struct regulator        *vdd10;
@@ -50,47 +59,42 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        struct dwc3_exynos      *exynos;
        struct device           *dev = &pdev->dev;
        struct device_node      *node = dev->of_node;
-
-       int                     ret;
+       const struct dwc3_exynos_driverdata *driver_data;
+       int                     i, ret;
 
        exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
        if (!exynos)
                return -ENOMEM;
 
-       platform_set_drvdata(pdev, exynos);
+       driver_data = of_device_get_match_data(dev);
+       exynos->dev = dev;
+       exynos->num_clks = driver_data->num_clks;
+       exynos->clk_names = (const char **)driver_data->clk_names;
+       exynos->suspend_clk_idx = driver_data->suspend_clk_idx;
 
-       exynos->dev     = dev;
+       platform_set_drvdata(pdev, exynos);
 
-       exynos->clk = devm_clk_get(dev, "usbdrd30");
-       if (IS_ERR(exynos->clk)) {
-               dev_err(dev, "couldn't get clock\n");
-               return -EINVAL;
+       for (i = 0; i < exynos->num_clks; i++) {
+               exynos->clks[i] = devm_clk_get(dev, exynos->clk_names[i]);
+               if (IS_ERR(exynos->clks[i])) {
+                       dev_err(dev, "failed to get clock: %s\n",
+                               exynos->clk_names[i]);
+                       return PTR_ERR(exynos->clks[i]);
+               }
        }
-       ret = clk_prepare_enable(exynos->clk);
-       if (ret)
-               return ret;
 
-       exynos->susp_clk = devm_clk_get(dev, "usbdrd30_susp_clk");
-       if (IS_ERR(exynos->susp_clk))
-               exynos->susp_clk = NULL;
-       ret = clk_prepare_enable(exynos->susp_clk);
-       if (ret)
-               goto susp_clk_err;
-
-       if (of_device_is_compatible(node, "samsung,exynos7-dwusb3")) {
-               exynos->axius_clk = devm_clk_get(dev, "usbdrd30_axius_clk");
-               if (IS_ERR(exynos->axius_clk)) {
-                       dev_err(dev, "no AXI UpScaler clk specified\n");
-                       ret = -ENODEV;
-                       goto axius_clk_err;
+       for (i = 0; i < exynos->num_clks; i++) {
+               ret = clk_prepare_enable(exynos->clks[i]);
+               if (ret) {
+                       while (--i > 0)
+                               clk_disable_unprepare(exynos->clks[i]);
+                       return ret;
                }
-               ret = clk_prepare_enable(exynos->axius_clk);
-               if (ret)
-                       goto axius_clk_err;
-       } else {
-               exynos->axius_clk = NULL;
        }
 
+       if (exynos->suspend_clk_idx >= 0)
+               clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
+
        exynos->vdd33 = devm_regulator_get(dev, "vdd33");
        if (IS_ERR(exynos->vdd33)) {
                ret = PTR_ERR(exynos->vdd33);
@@ -132,23 +136,27 @@ populate_err:
 vdd10_err:
        regulator_disable(exynos->vdd33);
 vdd33_err:
-       clk_disable_unprepare(exynos->axius_clk);
-axius_clk_err:
-       clk_disable_unprepare(exynos->susp_clk);
-susp_clk_err:
-       clk_disable_unprepare(exynos->clk);
+       for (i = exynos->num_clks - 1; i >= 0; i--)
+               clk_disable_unprepare(exynos->clks[i]);
+
+       if (exynos->suspend_clk_idx >= 0)
+               clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
+
        return ret;
 }
 
 static int dwc3_exynos_remove(struct platform_device *pdev)
 {
        struct dwc3_exynos      *exynos = platform_get_drvdata(pdev);
+       int i;
 
        device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child);
 
-       clk_disable_unprepare(exynos->axius_clk);
-       clk_disable_unprepare(exynos->susp_clk);
-       clk_disable_unprepare(exynos->clk);
+       for (i = exynos->num_clks - 1; i >= 0; i--)
+               clk_disable_unprepare(exynos->clks[i]);
+
+       if (exynos->suspend_clk_idx >= 0)
+               clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
 
        regulator_disable(exynos->vdd33);
        regulator_disable(exynos->vdd10);
@@ -156,10 +164,27 @@ static int dwc3_exynos_remove(struct platform_device *pdev)
        return 0;
 }
 
+static const struct dwc3_exynos_driverdata exynos5250_drvdata = {
+       .clk_names = { "usbdrd30" },
+       .num_clks = 1,
+       .suspend_clk_idx = -1,
+};
+
+static const struct dwc3_exynos_driverdata exynos7_drvdata = {
+       .clk_names = { "usbdrd30", "usbdrd30_susp_clk", "usbdrd30_axius_clk" },
+       .num_clks = 3,
+       .suspend_clk_idx = 1,
+};
+
 static const struct of_device_id exynos_dwc3_match[] = {
-       { .compatible = "samsung,exynos5250-dwusb3" },
-       { .compatible = "samsung,exynos7-dwusb3" },
-       {},
+       {
+               .compatible = "samsung,exynos5250-dwusb3",
+               .data = &exynos5250_drvdata,
+       }, {
+               .compatible = "samsung,exynos7-dwusb3",
+               .data = &exynos7_drvdata,
+       }, {
+       }
 };
 MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
 
@@ -167,9 +192,10 @@ MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
 static int dwc3_exynos_suspend(struct device *dev)
 {
        struct dwc3_exynos *exynos = dev_get_drvdata(dev);
+       int i;
 
-       clk_disable(exynos->axius_clk);
-       clk_disable(exynos->clk);
+       for (i = exynos->num_clks - 1; i >= 0; i--)
+               clk_disable_unprepare(exynos->clks[i]);
 
        regulator_disable(exynos->vdd33);
        regulator_disable(exynos->vdd10);
@@ -180,7 +206,7 @@ static int dwc3_exynos_suspend(struct device *dev)
 static int dwc3_exynos_resume(struct device *dev)
 {
        struct dwc3_exynos *exynos = dev_get_drvdata(dev);
-       int ret;
+       int i, ret;
 
        ret = regulator_enable(exynos->vdd33);
        if (ret) {
@@ -193,8 +219,14 @@ static int dwc3_exynos_resume(struct device *dev)
                return ret;
        }
 
-       clk_enable(exynos->clk);
-       clk_enable(exynos->axius_clk);
+       for (i = 0; i < exynos->num_clks; i++) {
+               ret = clk_prepare_enable(exynos->clks[i]);
+               if (ret) {
+                       while (--i > 0)
+                               clk_disable_unprepare(exynos->clks[i]);
+                       return ret;
+               }
+       }
 
        return 0;
 }