Unverified Commit 790f42a6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

This pull request contains Broadcom ARM/ARM64 SoC drivers changes for
5.16, please pull the following:

- Cai updates the bcm-pmb and bcm63xx-power drivers to use the
  devm_platform_ioremap_resource() helper

- Florian updates the Bus Interface Unit code to tune the 72116 and
  72113 chips according to their existing counterparts. The GISB driver is
  updated to be built as a non-removable module

* tag 'arm-soc/for-5.16/drivers' of https://github.com/Broadcom/stblinux:
  bus: brcmstb_gisb: Allow building as module
  soc: bcm: brcmstb: biuctrl: Tune MCP settings for 72116
  soc: bcm: brcmstb: biuctrl: Tune MCP settings for 72113
  soc: bcm63xx-power: Make use of the helper function devm_platform_ioremap_resource()
  soc: bcm: bcm-pmb: Make use of the helper function devm_platform_ioremap_resource()

Link: https://lore.kernel.org/r/20211013174016.831348-3-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 936fc53f 707a4cdf

drivers/bus/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ config ARM_INTEGRATOR_LM 
	  found on the ARM Integrator AP (Application Platform)



config BRCMSTB_GISB_ARB

	bool "Broadcom STB GISB bus arbiter"

	tristate "Broadcom STB GISB bus arbiter"

	depends on ARM || ARM64 || MIPS

	default ARCH_BRCMSTB || BMIPS_GENERIC

	help

drivers/bus/brcmstb_gisb.c

+6 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2014-2017 Broadcom

 * Copyright (C) 2014-2021 Broadcom

 */



#include <linux/init.h>
@@ -536,6 +536,7 @@ static struct platform_driver brcmstb_gisb_arb_driver = { 
		.name	= "brcm-gisb-arb",

		.of_match_table = brcmstb_gisb_arb_of_match,

		.pm	= &brcmstb_gisb_arb_pm_ops,

		.suppress_bind_attrs = true,

	},

};
@@ -546,3 +547,7 @@ static int __init brcm_gisb_driver_init(void) 
}



module_init(brcm_gisb_driver_init);



MODULE_AUTHOR("Broadcom");

MODULE_DESCRIPTION("Broadcom STB GISB arbiter driver");

MODULE_LICENSE("GPL v2");

drivers/soc/bcm/bcm63xx/bcm-pmb.c

+1 −3
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ static int bcm_pmb_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	const struct bcm_pmb_pd_data *table;

	const struct bcm_pmb_pd_data *e;

	struct resource *res;

	struct bcm_pmb *pmb;

	int max_id;

	int err;
@@ -287,8 +286,7 @@ static int bcm_pmb_probe(struct platform_device *pdev) 


	pmb->dev = dev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pmb->base = devm_ioremap_resource(&pdev->dev, res);

	pmb->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(pmb->base))

		return PTR_ERR(pmb->base);

drivers/soc/bcm/bcm63xx/bcm63xx-power.c

+1 −3
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static int bcm63xx_power_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct resource *res;

	const struct bcm63xx_power_data *entry, *table;

	struct bcm63xx_power *power;

	unsigned int ndom;
@@ -102,8 +101,7 @@ static int bcm63xx_power_probe(struct platform_device *pdev) 
	if (!power)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	power->base = devm_ioremap_resource(&pdev->dev, res);

	power->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(power->base))

		return PTR_ERR(power->base);

drivers/soc/bcm/brcmstb/biuctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ static int __init mcp_write_pairing_set(void) 


static const u32 a72_b53_mach_compat[] = {

	0x7211,

	0x72113,

	0x72116,

	0x7216,

	0x72164,

	0x72165,