Unverified Commit 347cdfc8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-drivers-for-6.6-1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents f1c047c2 23e9bf8e

drivers/bus/sunxi-rsb.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/soc/sunxi/sunxi_sram.c

+1 −1
Original line number Diff line number Diff line
@@ -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>