From: Carlos Song <carlos.song@nxp.com>
Use the clk_bulk API to handle clocks, so the code can support different
numbers of clocks more easily. Make the code cleaner and more flexible.
No change in functionality.
Signed-off-by: Carlos Song <carlos.song@nxp.com>
---
drivers/i3c/master/svc-i3c-master.c | 74 ++++++++++-------------------
1 file changed, 25 insertions(+), 49 deletions(-)
diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
index 85e16de208d3..47031aa54f11 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -203,9 +203,9 @@ struct svc_i3c_drvdata {
* @hj_work: Hot-join work
* @ibi_work: IBI work
* @irq: Main interrupt
- * @pclk: System clock
+ * @num_clks: I3C clock number
* @fclk: Fast clock (bus)
- * @sclk: Slow clock (other events)
+ * @clks: I3C clock array
* @xferqueue: Transfer queue structure
* @xferqueue.list: List member
* @xferqueue.cur: Current ongoing transfer
@@ -231,9 +231,9 @@ struct svc_i3c_master {
struct work_struct hj_work;
struct work_struct ibi_work;
int irq;
- struct clk *pclk;
+ int num_clks;
struct clk *fclk;
- struct clk *sclk;
+ struct clk_bulk_data *clks;
struct {
struct list_head list;
struct svc_i3c_xfer *cur;
@@ -1875,42 +1875,11 @@ static const struct i3c_master_controller_ops svc_i3c_master_ops = {
.set_speed = svc_i3c_master_set_speed,
};
-static int svc_i3c_master_prepare_clks(struct svc_i3c_master *master)
-{
- int ret = 0;
-
- ret = clk_prepare_enable(master->pclk);
- if (ret)
- return ret;
-
- ret = clk_prepare_enable(master->fclk);
- if (ret) {
- clk_disable_unprepare(master->pclk);
- return ret;
- }
-
- ret = clk_prepare_enable(master->sclk);
- if (ret) {
- clk_disable_unprepare(master->pclk);
- clk_disable_unprepare(master->fclk);
- return ret;
- }
-
- return 0;
-}
-
-static void svc_i3c_master_unprepare_clks(struct svc_i3c_master *master)
-{
- clk_disable_unprepare(master->pclk);
- clk_disable_unprepare(master->fclk);
- clk_disable_unprepare(master->sclk);
-}
-
static int svc_i3c_master_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct svc_i3c_master *master;
- int ret;
+ int ret, i;
master = devm_kzalloc(dev, sizeof(*master), GFP_KERNEL);
if (!master)
@@ -1924,27 +1893,31 @@ static int svc_i3c_master_probe(struct platform_device *pdev)
if (IS_ERR(master->regs))
return PTR_ERR(master->regs);
- master->pclk = devm_clk_get(dev, "pclk");
- if (IS_ERR(master->pclk))
- return PTR_ERR(master->pclk);
+ master->num_clks = devm_clk_bulk_get_all(dev, &master->clks);
+ if (master->num_clks < 0)
+ return dev_err_probe(dev, ret, "can't get I3C clocks\n");
+
+ for (i = 0; i < master->num_clks; i++) {
+ if (!strcmp(master->clks[i].id, "fast_clk"))
+ break;
+ }
+
+ if (i == master->num_clks)
+ return dev_err_probe(dev, -EINVAL,
+ "can't get I3C peripheral clock\n");
master->fclk = devm_clk_get(dev, "fast_clk");
if (IS_ERR(master->fclk))
return PTR_ERR(master->fclk);
- master->sclk = devm_clk_get(dev, "slow_clk");
- if (IS_ERR(master->sclk))
- return PTR_ERR(master->sclk);
-
master->irq = platform_get_irq(pdev, 0);
if (master->irq < 0)
return master->irq;
master->dev = dev;
-
- ret = svc_i3c_master_prepare_clks(master);
+ ret = clk_bulk_prepare_enable(master->num_clks, master->clks);
if (ret)
- return ret;
+ return dev_err_probe(dev, ret, "can't enable I3C clocks\n");
INIT_WORK(&master->hj_work, svc_i3c_master_hj_work);
INIT_WORK(&master->ibi_work, svc_i3c_master_ibi_work);
@@ -1998,7 +1971,7 @@ static int svc_i3c_master_probe(struct platform_device *pdev)
pm_runtime_set_suspended(&pdev->dev);
err_disable_clks:
- svc_i3c_master_unprepare_clks(master);
+ clk_bulk_disable_unprepare(master->num_clks, master->clks);
return ret;
}
@@ -2036,7 +2009,7 @@ static int __maybe_unused svc_i3c_runtime_suspend(struct device *dev)
struct svc_i3c_master *master = dev_get_drvdata(dev);
svc_i3c_save_regs(master);
- svc_i3c_master_unprepare_clks(master);
+ clk_bulk_disable_unprepare(master->num_clks, master->clks);
pinctrl_pm_select_sleep_state(dev);
return 0;
@@ -2045,9 +2018,12 @@ static int __maybe_unused svc_i3c_runtime_suspend(struct device *dev)
static int __maybe_unused svc_i3c_runtime_resume(struct device *dev)
{
struct svc_i3c_master *master = dev_get_drvdata(dev);
+ int ret;
pinctrl_pm_select_default_state(dev);
- svc_i3c_master_prepare_clks(master);
+ ret = clk_bulk_prepare_enable(master->num_clks, master->clks);
+ if (ret)
+ return ret;
svc_i3c_restore_regs(master);
--
2.34.1Hi,
kernel test robot noticed the following build warnings:
[auto build test WARNING on robh/for-next]
[also build test WARNING on linus/master v6.15-rc3 next-20250417]
[cannot apply to shawnguo/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/carlos-song-nxp-com/dt-bindings-i3c-silvaco-i3c-master-add-i-MX94-and-i-MX95-I3C/20250421-140716
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link: https://lore.kernel.org/r/20250421061544.2471379-3-carlos.song%40nxp.com
patch subject: [PATCH 2/3] i3c: master: svc: switch to bulk clk API for flexible clock support
config: arm-randconfig-001-20250421 (https://download.01.org/0day-ci/archive/20250421/202504211643.FJsMtmVl-lkp@intel.com/config)
compiler: clang version 21.0.0git (https://github.com/llvm/llvm-project f819f46284f2a79790038e1f6649172789734ae8)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250421/202504211643.FJsMtmVl-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202504211643.FJsMtmVl-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/i3c/master/svc-i3c-master.c:1898:29: warning: variable 'ret' is uninitialized when used here [-Wuninitialized]
1898 | return dev_err_probe(dev, ret, "can't get I3C clocks\n");
| ^~~
drivers/i3c/master/svc-i3c-master.c:1882:9: note: initialize the variable 'ret' to silence this warning
1882 | int ret, i;
| ^
| = 0
1 warning generated.
vim +/ret +1898 drivers/i3c/master/svc-i3c-master.c
1877
1878 static int svc_i3c_master_probe(struct platform_device *pdev)
1879 {
1880 struct device *dev = &pdev->dev;
1881 struct svc_i3c_master *master;
1882 int ret, i;
1883
1884 master = devm_kzalloc(dev, sizeof(*master), GFP_KERNEL);
1885 if (!master)
1886 return -ENOMEM;
1887
1888 master->drvdata = of_device_get_match_data(dev);
1889 if (!master->drvdata)
1890 return -EINVAL;
1891
1892 master->regs = devm_platform_ioremap_resource(pdev, 0);
1893 if (IS_ERR(master->regs))
1894 return PTR_ERR(master->regs);
1895
1896 master->num_clks = devm_clk_bulk_get_all(dev, &master->clks);
1897 if (master->num_clks < 0)
> 1898 return dev_err_probe(dev, ret, "can't get I3C clocks\n");
1899
1900 for (i = 0; i < master->num_clks; i++) {
1901 if (!strcmp(master->clks[i].id, "fast_clk"))
1902 break;
1903 }
1904
1905 if (i == master->num_clks)
1906 return dev_err_probe(dev, -EINVAL,
1907 "can't get I3C peripheral clock\n");
1908
1909 master->fclk = devm_clk_get(dev, "fast_clk");
1910 if (IS_ERR(master->fclk))
1911 return PTR_ERR(master->fclk);
1912
1913 master->irq = platform_get_irq(pdev, 0);
1914 if (master->irq < 0)
1915 return master->irq;
1916
1917 master->dev = dev;
1918 ret = clk_bulk_prepare_enable(master->num_clks, master->clks);
1919 if (ret)
1920 return dev_err_probe(dev, ret, "can't enable I3C clocks\n");
1921
1922 INIT_WORK(&master->hj_work, svc_i3c_master_hj_work);
1923 INIT_WORK(&master->ibi_work, svc_i3c_master_ibi_work);
1924 mutex_init(&master->lock);
1925
1926 ret = devm_request_irq(dev, master->irq, svc_i3c_master_irq_handler,
1927 IRQF_NO_SUSPEND, "svc-i3c-irq", master);
1928 if (ret)
1929 goto err_disable_clks;
1930
1931 master->free_slots = GENMASK(SVC_I3C_MAX_DEVS - 1, 0);
1932
1933 spin_lock_init(&master->xferqueue.lock);
1934 INIT_LIST_HEAD(&master->xferqueue.list);
1935
1936 spin_lock_init(&master->ibi.lock);
1937 master->ibi.num_slots = SVC_I3C_MAX_DEVS;
1938 master->ibi.slots = devm_kcalloc(&pdev->dev, master->ibi.num_slots,
1939 sizeof(*master->ibi.slots),
1940 GFP_KERNEL);
1941 if (!master->ibi.slots) {
1942 ret = -ENOMEM;
1943 goto err_disable_clks;
1944 }
1945
1946 platform_set_drvdata(pdev, master);
1947
1948 pm_runtime_set_autosuspend_delay(&pdev->dev, SVC_I3C_PM_TIMEOUT_MS);
1949 pm_runtime_use_autosuspend(&pdev->dev);
1950 pm_runtime_get_noresume(&pdev->dev);
1951 pm_runtime_set_active(&pdev->dev);
1952 pm_runtime_enable(&pdev->dev);
1953
1954 svc_i3c_master_reset(master);
1955
1956 /* Register the master */
1957 ret = i3c_master_register(&master->base, &pdev->dev,
1958 &svc_i3c_master_ops, false);
1959 if (ret)
1960 goto rpm_disable;
1961
1962 pm_runtime_mark_last_busy(&pdev->dev);
1963 pm_runtime_put_autosuspend(&pdev->dev);
1964
1965 return 0;
1966
1967 rpm_disable:
1968 pm_runtime_dont_use_autosuspend(&pdev->dev);
1969 pm_runtime_put_noidle(&pdev->dev);
1970 pm_runtime_disable(&pdev->dev);
1971 pm_runtime_set_suspended(&pdev->dev);
1972
1973 err_disable_clks:
1974 clk_bulk_disable_unprepare(master->num_clks, master->clks);
1975
1976 return ret;
1977 }
1978
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2025 Red Hat, Inc.