diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-14 18:26:20 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-14 18:26:27 +0200 |
| commit | 93e0acaec320e5323fe269deb93365f4f4a8d731 (patch) | |
| tree | 148e7061f147ae1d5051fda3b80279b4ab9afa8c /drivers/genpd | |
| parent | f15897c25f8e8d35bce445d80f48e481329151ab (diff) | |
| parent | 443012dd31e5939cb53bc9c5713d32d87321b0d8 (diff) | |
Merge tag 'ti-driver-soc-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/drivers
TI SoC driver updates for v6.6
- Generic fixups: Explicitly include correct DT include.
- omap_prm: Cosmetic fixups for using devm_ api for ioremap_resource
- ti_sci: Documentation fixups, Using system_state to determine if
polling is needed.
- k3-ringcc: Documentation fixups, cleanup of log messages, using
devm_ to handle ioremap_resource.
- k3-socinfo: Add AM62PX detection.
* tag 'ti-driver-soc-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
soc: ti: k3-socinfo.c: Add JTAG ID for AM62PX
soc: ti: Use devm_platform_ioremap_resource_byname simplify logic
soc: ti: k3-ringacc: remove non-fatal probe deferral log
soc: ti: Explicitly include correct DT includes
soc: ti: omap-prm: Use devm_platform_get_and_ioremap_resource()
soc: ti: k3-ringacc: Fixup documentation errors
firmware: ti_sci: Fixup documentation errors
firmware: ti_sci: Use system_state to determine polling
Link: https://lore.kernel.org/r/20230814160633.my3xbk5k2pxkvjyi@degrease
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/genpd')
| -rw-r--r-- | drivers/genpd/ti/omap_prm.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/genpd/ti/omap_prm.c b/drivers/genpd/ti/omap_prm.c index ecd9a8bdd7c0..c2feae3a634c 100644 --- a/drivers/genpd/ti/omap_prm.c +++ b/drivers/genpd/ti/omap_prm.c @@ -13,7 +13,6 @@ #include <linux/iopoll.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_clock.h> #include <linux/pm_domain.h> @@ -943,10 +942,6 @@ static int omap_prm_probe(struct platform_device *pdev) struct omap_prm *prm; int ret; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; - data = of_device_get_match_data(&pdev->dev); if (!data) return -ENOTSUPP; @@ -955,6 +950,10 @@ static int omap_prm_probe(struct platform_device *pdev) if (!prm) return -ENOMEM; + prm->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); + if (IS_ERR(prm->base)) + return PTR_ERR(prm->base); + while (data->base != res->start) { if (!data->base) return -EINVAL; @@ -963,10 +962,6 @@ static int omap_prm_probe(struct platform_device *pdev) prm->data = data; - prm->base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(prm->base)) - return PTR_ERR(prm->base); - ret = omap_prm_domain_init(&pdev->dev, prm); if (ret) return ret; |