Unverified Commit 3ac02aa5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-6.4/drivers' of https://github.com/Broadcom/stblinux into soc/drivers 

This pull request contains Broadcom SoCs drivers changes for 6.4, please
pull the following:

- Zhaoyang fixes an of_iomap() leak in the STB BIU driver

- Florian removes the bare-metal ARM suspend/resume code which has long
  been replaced by the standard PSCI suspend/resume.

* tag 'arm-soc/for-6.4/drivers' of https://github.com/Broadcom/stblinux

:
  soc: bcm: brcmstb: biuctrl: fix of_iomap leak
  soc: bcm: brcmstb: Remove bare-metal ARM suspend/resume code
  kbuild, soc: bcm: bcm2835-power: remove MODULE_LICENSE in non-modules
  kbuild, soc: bcm: raspberrypi-power: remove MODULE_LICENSE in non-modules
  bus: brcmstb_gisb: Use devm_platform_get_and_ioremap_resource()

Link: https://lore.kernel.org/r/20230410232606.1917803-3-f.fainelli@gmail.com
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 126c6da7 c3fbced9

drivers/bus/brcmstb_gisb.c

+1 −3
Original line number Diff line number Diff line
@@ -401,12 +401,10 @@ static int __init brcmstb_gisb_arb_probe(struct platform_device *pdev) 
	struct device_node *dn = pdev->dev.of_node;

	struct brcmstb_gisb_arb_device *gdev;

	const struct of_device_id *of_id;

	struct resource *r;

	int err, timeout_irq, tea_irq, bp_irq;

	unsigned int num_masters, j = 0;

	int i, first, last;



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	timeout_irq = platform_get_irq(pdev, 0);

	tea_irq = platform_get_irq(pdev, 1);

	bp_irq = platform_get_irq(pdev, 2);
@@ -418,7 +416,7 @@ static int __init brcmstb_gisb_arb_probe(struct platform_device *pdev) 
	mutex_init(&gdev->lock);

	INIT_LIST_HEAD(&gdev->next);



	gdev->base = devm_ioremap_resource(&pdev->dev, r);

	gdev->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);

	if (IS_ERR(gdev->base))

		return PTR_ERR(gdev->base);

drivers/soc/bcm/bcm2835-power.c

+0 −1
Original line number Diff line number Diff line
@@ -711,4 +711,3 @@ module_platform_driver(bcm2835_power_driver); 


MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");

MODULE_DESCRIPTION("Driver for Broadcom BCM2835 PM power domains and reset");
 
MODULE_LICENSE("GPL");

drivers/soc/bcm/brcmstb/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ if SOC_BRCMSTB 
config BRCMSTB_PM

	bool "Support suspend/resume for STB platforms"

	default y

	depends on PM

	depends on ARCH_BRCMSTB || BMIPS_GENERIC

	select ARM_CPU_SUSPEND if ARM

	depends on PM && BMIPS_GENERIC



endif # SOC_BRCMSTB

drivers/soc/bcm/brcmstb/biuctrl.c

+4 −0
Original line number Diff line number Diff line
@@ -288,6 +288,10 @@ static int __init setup_hifcpubiuctrl_regs(struct device_node *np) 
	if (BRCM_ID(family_id) == 0x7260 && BRCM_REV(family_id) == 0)

		cpubiuctrl_regs = b53_cpubiuctrl_no_wb_regs;

out:

	if (ret && cpubiuctrl_base) {

		iounmap(cpubiuctrl_base);

		cpubiuctrl_base = NULL;

	}

	return ret;

}

drivers/soc/bcm/brcmstb/pm/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_ARM)		+= s2-arm.o pm-arm.o

obj-$(CONFIG_BMIPS_GENERIC)	+= s2-mips.o s3-mips.o pm-mips.o