diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 12:07:58 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 12:07:58 +0200 |
| commit | 347cdfc86b0c6b869722d02ba2bde421099621c9 (patch) | |
| tree | 401f100072b51e4c93dd3476887f30e8c9f2b9c5 | |
| parent | f1c047c2f7dd9337441f6711733bb79ac4d7d2e7 (diff) | |
| parent | 23e9bf8e78ba2ed32e9bf5a37c5074b9dfc29110 (diff) | |
| download | linux-stable-347cdfc86b0c6b869722d02ba2bde421099621c9.tar.gz linux-stable-347cdfc86b0c6b869722d02ba2bde421099621c9.tar.bz2 linux-stable-347cdfc86b0c6b869722d02ba2bde421099621c9.zip | |
Merge tag 'sunxi-drivers-for-6.6-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers
- simplify code in sunxi-rsb
- fix includes in sunxi_sram
* tag 'sunxi-drivers-for-6.6-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
soc: sunxi: Explicitly include correct DT includes
bus: sunxi-rsb: Convert to devm_platform_ioremap_resource()
Link: https://lore.kernel.org/r/20230806180650.GA127142@jernej-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/bus/sunxi-rsb.c | 4 | ||||
| -rw-r--r-- | drivers/soc/sunxi/sunxi_sram.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c index 696c0aefb0ca..2aefd5dde3c9 100644 --- a/drivers/bus/sunxi-rsb.c +++ b/drivers/bus/sunxi-rsb.c @@ -746,7 +746,6 @@ static int sunxi_rsb_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct resource *r; struct sunxi_rsb *rsb; u32 clk_freq = 3000000; int irq, ret; @@ -766,8 +765,7 @@ static int sunxi_rsb_probe(struct platform_device *pdev) rsb->dev = dev; rsb->clk_freq = clk_freq; platform_set_drvdata(pdev, rsb); - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - rsb->regs = devm_ioremap_resource(dev, r); + rsb->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(rsb->regs)) return PTR_ERR(rsb->regs); diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 4c4864cd2342..4458b2e0562b 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -15,7 +15,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/regmap.h> |