clk: renesas: rcar-usb2-clock-sel: Add multiple clocks management

This hardware needs to enable clocks of both host and peripheral.
So, this patch adds multiple clocks management.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/1583304137-28482-4-git-send-email-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/drivers/clk/renesas/rcar-usb2-clock-sel.c b/drivers/clk/renesas/rcar-usb2-clock-sel.c
index b97f5f9326cfc709ed91a8b9008c8fd7b935b491..d5f47ab017b74bb9c4cedea4f0e66005ea526ba2 100644 (file)
--- a/drivers/clk/renesas/rcar-usb2-clock-sel.c
+++ b/drivers/clk/renesas/rcar-usb2-clock-sel.c
@@ -26,9 +26,15 @@
 #define CLKSET0_PRIVATE                BIT(0)
 #define CLKSET0_EXTAL_ONLY     (CLKSET0_INTCLK_EN | CLKSET0_PRIVATE)
 
+static const struct clk_bulk_data rcar_usb2_clocks[] = {
+       { .id = "ehci_ohci", },
+       { .id = "hs-usb-if", },
+};
+
 struct usb2_clock_sel_priv {
        void __iomem *base;
        struct clk_hw hw;
+       struct clk_bulk_data clks[ARRAY_SIZE(rcar_usb2_clocks)];
        bool extal;
        bool xtal;
 };
@@ -53,14 +59,25 @@ static void usb2_clock_sel_disable_extal_only(struct usb2_clock_sel_priv *priv)
 
 static int usb2_clock_sel_enable(struct clk_hw *hw)
 {
-       usb2_clock_sel_enable_extal_only(to_priv(hw));
+       struct usb2_clock_sel_priv *priv = to_priv(hw);
+       int ret;
+
+       ret = clk_bulk_prepare_enable(ARRAY_SIZE(priv->clks), priv->clks);
+       if (ret)
+               return ret;
+
+       usb2_clock_sel_enable_extal_only(priv);
 
        return 0;
 }
 
 static void usb2_clock_sel_disable(struct clk_hw *hw)
 {
-       usb2_clock_sel_disable_extal_only(to_priv(hw));
+       struct usb2_clock_sel_priv *priv = to_priv(hw);
+
+       usb2_clock_sel_disable_extal_only(priv);
+
+       clk_bulk_disable_unprepare(ARRAY_SIZE(priv->clks), priv->clks);
 }
 
 /*
@@ -119,6 +136,7 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
        struct usb2_clock_sel_priv *priv;
        struct clk *clk;
        struct clk_init_data init;
+       int ret;
 
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -128,6 +146,11 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
        if (IS_ERR(priv->base))
                return PTR_ERR(priv->base);
 
+       memcpy(priv->clks, rcar_usb2_clocks, sizeof(priv->clks));
+       ret = devm_clk_bulk_get(dev, ARRAY_SIZE(priv->clks), priv->clks);
+       if (ret < 0)
+               return ret;
+
        pm_runtime_enable(dev);
        pm_runtime_get_sync(dev);