]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
reset: brcmstb: Enable reset drivers for ARCH_BCM2835
authorPeter Robinson <pbrobinson@gmail.com>
Mon, 30 Jun 2025 17:52:58 +0000 (18:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:41:01 +0000 (18:41 +0200)
[ Upstream commit 1d99f92f71b6b4b2eee776562c991428490f71ef ]

The BRCMSTB and BRCMSTB_RESCAL reset drivers are also
used in the BCM2712, AKA the RPi5. The RPi platforms
have typically used the ARCH_BCM2835, and the PCIe
support for this SoC can use this config which depends
on these drivers so enable building them when just that
arch option is enabled to ensure the platform works as
expected.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20250630175301.846082-1-pbrobinson@gmail.com
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/reset/Kconfig

index d85be5899da6aba92f89c25b00dacc6618bc2255..ec8c953cb73d465c64b7a1f41bb3962b664017e0 100644 (file)
@@ -51,8 +51,8 @@ config RESET_BERLIN
 
 config RESET_BRCMSTB
        tristate "Broadcom STB reset controller"
-       depends on ARCH_BRCMSTB || COMPILE_TEST
-       default ARCH_BRCMSTB
+       depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST
+       default ARCH_BRCMSTB || ARCH_BCM2835
        help
          This enables the reset controller driver for Broadcom STB SoCs using
          a SUN_TOP_CTRL_SW_INIT style controller.
@@ -60,11 +60,11 @@ config RESET_BRCMSTB
 config RESET_BRCMSTB_RESCAL
        tristate "Broadcom STB RESCAL reset controller"
        depends on HAS_IOMEM
-       depends on ARCH_BRCMSTB || COMPILE_TEST
-       default ARCH_BRCMSTB
+       depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST
+       default ARCH_BRCMSTB || ARCH_BCM2835
        help
          This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on
-         BCM7216.
+         BCM7216 or the BCM2712.
 
 config RESET_EYEQ
        bool "Mobileye EyeQ reset controller"