usb: mtu3: use clock bulk to get clocks

Use clock bulk helpers to get/enable/disable clocks, meanwhile
make sys_ck optional, then will be easier to handle clocks.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1623139069-8173-24-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
index daf2b29..5546b86 100644 (file)
--- a/drivers/usb/mtu3/mtu3.h
+++ b/drivers/usb/mtu3/mtu3.h
@@ -10,6 +10,7 @@
 #ifndef __MTU3_H__
 #define __MTU3_H__
 
+#include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/dmapool.h>
 #include <linux/extcon.h>
@@ -89,6 +90,8 @@ struct mtu3_request;
  */
 #define EP0_RESPONSE_BUF  6
 
+#define BULK_CLKS_CNT  4
+
 /* device operated link and speed got from DEVICE_CONF register */
 enum mtu3_speed {
        MTU3_SPEED_INACTIVE = 0,
@@ -219,10 +222,6 @@ struct otg_switch_mtk {
  * @mac_base: register base address of device MAC, exclude xHCI's
  * @ippc_base: register base address of IP Power and Clock interface (IPPC)
  * @vusb33: usb3.3V shared by device/host IP
- * @sys_clk: system clock of mtu3, shared by device/host IP
- * @ref_clk: reference clock
- * @mcu_clk: mcu_bus_ck clock for AHB bus etc
- * @dma_clk: dma_bus_ck clock for AXI bus etc
  * @dr_mode: works in which mode:
  *             host only, device only or dual-role mode
  * @u2_ports: number of usb2.0 host ports
@@ -244,10 +243,7 @@ struct ssusb_mtk {
        int num_phys;
        /* common power & clock */
        struct regulator *vusb33;
-       struct clk *sys_clk;
-       struct clk *ref_clk;
-       struct clk *mcu_clk;
-       struct clk *dma_clk;
+       struct clk_bulk_data clks[BULK_CLKS_CNT];
        /* otg */
        struct otg_switch_mtk otg_switch;
        enum usb_dr_mode dr_mode;

diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index bbfabdc..c0615f6 100644 (file)
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -5,7 +5,6 @@
  * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
  */
 
-#include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
@@ -101,54 +100,6 @@ static void ssusb_phy_power_off(struct ssusb_mtk *ssusb)
                phy_power_off(ssusb->phys[i]);
 }
 
-static int ssusb_clks_enable(struct ssusb_mtk *ssusb)
-{
-       int ret;
-
-       ret = clk_prepare_enable(ssusb->sys_clk);
-       if (ret) {
-               dev_err(ssusb->dev, "failed to enable sys_clk\n");
-               goto sys_clk_err;
-       }
-
-       ret = clk_prepare_enable(ssusb->ref_clk);
-       if (ret) {
-               dev_err(ssusb->dev, "failed to enable ref_clk\n");
-               goto ref_clk_err;
-       }
-
-       ret = clk_prepare_enable(ssusb->mcu_clk);
-       if (ret) {
-               dev_err(ssusb->dev, "failed to enable mcu_clk\n");
-               goto mcu_clk_err;
-       }
-
-       ret = clk_prepare_enable(ssusb->dma_clk);
-       if (ret) {
-               dev_err(ssusb->dev, "failed to enable dma_clk\n");
-               goto dma_clk_err;
-       }
-
-       return 0;
-
-dma_clk_err:
-       clk_disable_unprepare(ssusb->mcu_clk);
-mcu_clk_err:
-       clk_disable_unprepare(ssusb->ref_clk);
-ref_clk_err:
-       clk_disable_unprepare(ssusb->sys_clk);
-sys_clk_err:
-       return ret;
-}
-
-static void ssusb_clks_disable(struct ssusb_mtk *ssusb)
-{
-       clk_disable_unprepare(ssusb->dma_clk);
-       clk_disable_unprepare(ssusb->mcu_clk);
-       clk_disable_unprepare(ssusb->ref_clk);
-       clk_disable_unprepare(ssusb->sys_clk);
-}
-
 static int ssusb_rscs_init(struct ssusb_mtk *ssusb)
 {
        int ret = 0;
@@ -159,7 +110,7 @@ static int ssusb_rscs_init(struct ssusb_mtk *ssusb)
                goto vusb33_err;
        }
 
-       ret = ssusb_clks_enable(ssusb);
+       ret = clk_bulk_prepare_enable(BULK_CLKS_CNT, ssusb->clks);
        if (ret)
                goto clks_err;
 
@@ -180,7 +131,7 @@ static int ssusb_rscs_init(struct ssusb_mtk *ssusb)
 phy_err:
        ssusb_phy_exit(ssusb);
 phy_init_err:
-       ssusb_clks_disable(ssusb);
+       clk_bulk_disable_unprepare(BULK_CLKS_CNT, ssusb->clks);
 clks_err:
        regulator_disable(ssusb->vusb33);
 vusb33_err:
@@ -189,7 +140,7 @@ vusb33_err:
 
 static void ssusb_rscs_exit(struct ssusb_mtk *ssusb)
 {
-       ssusb_clks_disable(ssusb);
+       clk_bulk_disable_unprepare(BULK_CLKS_CNT, ssusb->clks);
        regulator_disable(ssusb->vusb33);
        ssusb_phy_power_off(ssusb);
        ssusb_phy_exit(ssusb);
@@ -215,6 +166,7 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
 {
        struct device_node *node = pdev->dev.of_node;
        struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
+       struct clk_bulk_data *clks = ssusb->clks;
        struct device *dev = &pdev->dev;
        int i;
        int ret;
@@ -225,23 +177,13 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
                return PTR_ERR(ssusb->vusb33);
        }
 
-       ssusb->sys_clk = devm_clk_get(dev, "sys_ck");
-       if (IS_ERR(ssusb->sys_clk)) {
-               dev_err(dev, "failed to get sys clock\n");
-               return PTR_ERR(ssusb->sys_clk);
-       }
-
-       ssusb->ref_clk = devm_clk_get_optional(dev, "ref_ck");
-       if (IS_ERR(ssusb->ref_clk))
-               return PTR_ERR(ssusb->ref_clk);
-
-       ssusb->mcu_clk = devm_clk_get_optional(dev, "mcu_ck");
-       if (IS_ERR(ssusb->mcu_clk))
-               return PTR_ERR(ssusb->mcu_clk);
-
-       ssusb->dma_clk = devm_clk_get_optional(dev, "dma_ck");
-       if (IS_ERR(ssusb->dma_clk))
-               return PTR_ERR(ssusb->dma_clk);
+       clks[0].id = "sys_ck";
+       clks[1].id = "ref_ck";
+       clks[2].id = "mcu_ck";
+       clks[3].id = "dma_ck";
+       ret = devm_clk_bulk_get_optional(dev, BULK_CLKS_CNT, clks);
+       if (ret)
+               return ret;
 
        ssusb->num_phys = of_count_phandle_with_args(node,
                        "phys", "#phy-cells");
@@ -464,7 +406,7 @@ static int __maybe_unused mtu3_suspend(struct device *dev)
 
        ssusb_host_disable(ssusb, true);
        ssusb_phy_power_off(ssusb);
-       ssusb_clks_disable(ssusb);
+       clk_bulk_disable_unprepare(BULK_CLKS_CNT, ssusb->clks);
        ssusb_wakeup_set(ssusb, true);
 
        return 0;
@@ -481,7 +423,7 @@ static int __maybe_unused mtu3_resume(struct device *dev)
                return 0;
 
        ssusb_wakeup_set(ssusb, false);
-       ret = ssusb_clks_enable(ssusb);
+       ret = clk_bulk_prepare_enable(BULK_CLKS_CNT, ssusb->clks);
        if (ret)
                goto clks_err;
 
@@ -494,7 +436,7 @@ static int __maybe_unused mtu3_resume(struct device *dev)
        return 0;
 
 phy_err:
-       ssusb_clks_disable(ssusb);
+       clk_bulk_disable_unprepare(BULK_CLKS_CNT, ssusb->clks);
 clks_err:
        return ret;
 }