summaryrefslogtreecommitdiff
path: root/drivers/bus
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-10-13 23:01:39 +0200
committerArnd Bergmann <arnd@arndb.de>2021-10-13 23:01:40 +0200
commit790f42a61e159d2b52a1a5c55aad66ab6ab321d3 (patch)
treefa37381115aab8a34266abe33665648e74974354 /drivers/bus
parent936fc53f3dd495726cdd3ae34079d0622fe7b2ca (diff)
parent707a4cdf86e5d6a2c4fad51fb98a6ff3425f820e (diff)
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/Kconfig2
-rw-r--r--drivers/bus/brcmstb_gisb.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index a5b96f3aad67..9cfeae3fc244 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -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
diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c
index 6551286a60cc..4c2f7d61cb9b 100644
--- a/drivers/bus/brcmstb_gisb.c
+++ b/drivers/bus/brcmstb_gisb.c
@@ -1,6 +1,6 @@
// 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");