Skip to content

Commit 759c2e0

Browse files
committed
Merge tag 'arm-soc/for-6.7/drivers' of https://github.com/Broadcom/stblinux into soc/drivers
This pull request contains Broadcom ARM/ARM64/MIPS SoCs drivers changes for 6.7, please pull the following: - Kieran fixes the kdoc for devm_rpi_firmware_get - Peter updates the dependices of the brcmstb SoC driver and brcmstb_gisb drivers which are ARCH_BRCMSTB specific * tag 'arm-soc/for-6.7/drivers' of https://github.com/Broadcom/stblinux: bus: brcmstb_gisb: Depend on SoC specifics over generic arm soc: bcm: brcmstb: depend on ARCH_BRCMSTB over arm arches firmware: raspberrypi: Fix devm_rpi_firmware_get documentation Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 8519f9c + 112cd2f commit 759c2e0

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

drivers/bus/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ config ARM_INTEGRATOR_LM
3131

3232
config BRCMSTB_GISB_ARB
3333
tristate "Broadcom STB GISB bus arbiter"
34-
depends on ARM || ARM64 || MIPS
34+
depends on ARCH_BRCMSTB || BMIPS_GENERIC
3535
default ARCH_BRCMSTB || BMIPS_GENERIC
3636
help
3737
Driver for the Broadcom Set Top Box System-on-a-chip internal bus

drivers/firmware/raspberrypi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ EXPORT_SYMBOL_GPL(rpi_firmware_get);
378378

379379
/**
380380
* devm_rpi_firmware_get - Get pointer to rpi_firmware structure.
381+
* @dev: The firmware device structure
381382
* @firmware_node: Pointer to the firmware Device Tree node.
382383
*
383384
* Returns NULL is the firmware device is not ready.

drivers/soc/bcm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ config SOC_BCM63XX
3333

3434
config SOC_BRCMSTB
3535
bool "Broadcom STB SoC drivers"
36-
depends on ARM || ARM64 || BMIPS_GENERIC || COMPILE_TEST
36+
depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
3737
select SOC_BUS
3838
help
3939
Enables drivers for the Broadcom Set-Top Box (STB) series of chips.

0 commit comments

Comments
 (0)