TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i.MX clock changes for 6.18

Browse Source 
- Rework the i.MX95 BLK CTL driver to add the platform data to the
   state container.
 - Retain the state of the i.MS95 BLK CTL registers through both
 runtime and system suspend.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEETvPuEU56jyrKp9G4G19EyQCVFVYFAmjJD+4ACgkQG19EyQCV
 FVYnAg/+Nt7Usda/vRJlQv5207GoelDE7QjsNt1I+HRNn+2PBkV7Px+ltttwzuAH
 w04mvjWoreoKfH18QHzFtDuJ7dTzNWhCPplO31OKEL2r+z/efDtpcd52NSD3/j7B
 Rfi5edLjAvF4SnyXDn2lIJmMplmZLfhK5JzzUsYkhm70sa27K3JSSWu9PKrr5fZq
 IqnXJ60AtIiLeICUuQJWFmOam9TukiWeTtUZ2Co1QVtb4WhYvLPJiN7CVyDFFRRS
 SppIN3xw6ZHgK5pZJ+gEKXYBOLwCgBKjiKgigQMCbDokiKD0Y+KAx2sGhwoeWsTq
 gax5HxfRjNQTF6SoOTUy1C+ZsjXdASB+G3+QKIBZEHnl8XLdwlBB+R2w+S1E3qIW
 t0ksu2lQT/+PmIT8dRBFhA8DmMszIWw4W0RbMAXcvH6ElL+sEK7RmqY+xw4jdFGw
 F101r9jIpGkMYu0XIpFlBQAdnwj6KAMslcWErgtoMKdK2s2WbsH/swWxpfunI/vG
 KA8dy+8zXwqqbpR/EtfDUcqR4SnOmdNLxvfWZd7UW8j64Z3v0vE9iyW9uZOCYAPV
 x108BHIhPM980xC9frvWHDwSp7rEkdoPHAniAAtnMQWwYvpkkATEjeRb+wVjWR4C
 M4Ts2FHp79jrvgOlOX3YMTIawJ4XVNqFPqsp6aA1TOzSQW6447c=
 =DAZu
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCAAyFiEE9L57QeeUxqYDyoaDrQKIl8bklSUFAmjKO/EUHHN3Ym95ZEBj
 aHJvbWl1bS5vcmcACgkQrQKIl8bklSU53hAA3CddU1ZG5uMs/G34eo2FnxQ00XVI
 wUVKKbOyA1JfrnpyUmRjaJb2T+b2uJWV30BsUIAvG2/N07QLZlkoel6t57JdWH69
 bLk0A2sUL+Jkcz0FuwH7u6YV05/lrqLgxx2m+F8h1wyealIdYlgG16e/0rZOXoNq
 UzDfDVioYc82C4HLgufR7Y71foI7drHT67gJHxvX80StLqbbypupwhOtFyY9LTUM
 uzNVr3vDRadobnE33MdbK6z5l5Oa/RjKgsCQSkMjy66UY7oC6C3QpNM9EBlyk9Ph
 TkoI2VGxKrDp8izUSt64oRMEaD6qyjmwBOM1ioc4Pq2CttMnICX1XOoU4JXb/a2E
 BcSVjxFPJluliExRXg0RyaP/7xiKKHvpjbq1PDYVT3yL77z2QkCA+nL4DWUgD7IH
 yH4MTp6tD3H/16IZtyUOwibKY12STWSC+I2PuCZooJvu0r+g+DKqYEEsXWZkzxPu
 rLVlhQKlGZ4q3sUZTwMSHJ6RW7zB8cGS1pJfYFbRJJKU6L+CZ5XwZIJ31puzsiEA
 M+MIPy2Y1x9fJ3hcwvu3dPVauNX+DDNFUXFLvWTs9lZGByEsWQxQ7hx37ia1As2+
 u//mu/X/osE8laiGt4fi+rRJua0OcMridok6VEeawuSAfUcGJ2ENxWigWkUCmlkh
 PyTwV+/FhspPme8=
 =hydE
 -----END PGP SIGNATURE-----

Merge tag 'clk-imx-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux into clk-imx

Pull i.MX clk driver updates from Abel Vesa:

 - Rework the i.MX95 BLK CTL driver to add the platform data to
   the state container
 - Retain the state of the i.MS95 BLK CTL registers through both
   runtime and system suspend

* tag 'clk-imx-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux:
  clk: imx95-blk-ctl: Save/restore registers when RPM routines are called
  clk: imx95-blk-ctl: Save platform data in imx95_blk_ctl structure
This commit is contained in:
Stephen Boyd 2025-09-16 21:40:54 -07:00
commit acf800c8fc
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/clk/imx/clk-imx95-blk-ctl.c
View File

@ -36,6 +36,7 @@ struct imx95_blk_ctl {
void __iomem *base;
/* clock gate register */
u32 clk_reg_restore;
const struct imx95_blk_ctl_dev_data *pdata;
};
struct imx95_blk_ctl_clk_dev_data {
@ -349,7 +350,6 @@ static const struct imx95_blk_ctl_dev_data imx94_dispmix_csr_dev_data = {
static int imx95_bc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
const struct imx95_blk_ctl_dev_data *bc_data;
struct imx95_blk_ctl *bc;
struct clk_hw_onecell_data *clk_hw_data;
struct clk_hw **hws;
@ -379,25 +379,25 @@ static int imx95_bc_probe(struct platform_device *pdev)
return ret;
}
bc_data = of_device_get_match_data(dev);
if (!bc_data)
bc->pdata = of_device_get_match_data(dev);
if (!bc->pdata)
return devm_of_platform_populate(dev);
clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, bc_data->num_clks),
clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, bc->pdata->num_clks),
GFP_KERNEL);
if (!clk_hw_data)
return -ENOMEM;
if (bc_data->rpm_enabled) {
if (bc->pdata->rpm_enabled) {
devm_pm_runtime_enable(&pdev->dev);
pm_runtime_resume_and_get(&pdev->dev);
}
clk_hw_data->num = bc_data->num_clks;
clk_hw_data->num = bc->pdata->num_clks;
hws = clk_hw_data->hws;
for (i = 0; i < bc_data->num_clks; i++) {
const struct imx95_blk_ctl_clk_dev_data *data = &bc_data->clk_dev_data[i];
for (i = 0; i < bc->pdata->num_clks; i++) {
const struct imx95_blk_ctl_clk_dev_data *data = &bc->pdata->clk_dev_data[i];
void __iomem *reg = base + data->reg;
if (data->type == CLK_MUX) {
@ -439,7 +439,7 @@ static int imx95_bc_probe(struct platform_device *pdev)
return 0;
cleanup:
for (i = 0; i < bc_data->num_clks; i++) {
for (i = 0; i < bc->pdata->num_clks; i++) {
if (IS_ERR_OR_NULL(hws[i]))
continue;
clk_hw_unregister(hws[i]);
@ -453,15 +453,24 @@ static int imx95_bc_runtime_suspend(struct device *dev)
{
struct imx95_blk_ctl *bc = dev_get_drvdata(dev);
bc->clk_reg_restore = readl(bc->base + bc->pdata->clk_reg_offset);
clk_disable_unprepare(bc->clk_apb);
return 0;
}
static int imx95_bc_runtime_resume(struct device *dev)
{
struct imx95_blk_ctl *bc = dev_get_drvdata(dev);
int ret;
return clk_prepare_enable(bc->clk_apb);
ret = clk_prepare_enable(bc->clk_apb);
if (ret)
return ret;
writel(bc->clk_reg_restore, bc->base + bc->pdata->clk_reg_offset);
return 0;
}
#endif
@ -469,22 +478,12 @@ static int imx95_bc_runtime_resume(struct device *dev)
static int imx95_bc_suspend(struct device *dev)
{
struct imx95_blk_ctl *bc = dev_get_drvdata(dev);
const struct imx95_blk_ctl_dev_data *bc_data;
int ret;
bc_data = of_device_get_match_data(dev);
if (!bc_data)
if (pm_runtime_suspended(dev))
return 0;
if (bc_data->rpm_enabled) {
ret = pm_runtime_get_sync(bc->dev);
if (ret < 0) {
pm_runtime_put_noidle(bc->dev);
return ret;
}
}
bc->clk_reg_restore = readl(bc->base + bc_data->clk_reg_offset);
bc->clk_reg_restore = readl(bc->base + bc->pdata->clk_reg_offset);
clk_disable_unprepare(bc->clk_apb);
return 0;
}
@ -492,16 +491,16 @@ static int imx95_bc_suspend(struct device *dev)
static int imx95_bc_resume(struct device *dev)
{
struct imx95_blk_ctl *bc = dev_get_drvdata(dev);
const struct imx95_blk_ctl_dev_data *bc_data;
int ret;
bc_data = of_device_get_match_data(dev);
if (!bc_data)
if (pm_runtime_suspended(dev))
return 0;
writel(bc->clk_reg_restore, bc->base + bc_data->clk_reg_offset);
ret = clk_prepare_enable(bc->clk_apb);
if (ret)
return ret;
if (bc_data->rpm_enabled)
pm_runtime_put(bc->dev);
writel(bc->clk_reg_restore, bc->base + bc->pdata->clk_reg_offset);
return 0;
}