BCM270x: Enable bcm2835_wdt and bcm2835-rng

Change the kconfig dependency to make bcm2835_wdt and bcm2835-rng available on ARCH_BCM2708 and ARCH_BCM2709. Enable them as loadable modules in bcmrpi_defconfig and bcm2709_defconfig. There is a commit in linux-next that will move restart/pm_power_off to bcm2835_wdt for ARCH_BCM2835. This will not affect ARCH_BCM270x since arm_pm_restart (.restart = bcm2708_restart) and pm_power_off (=bcm2708_power_off) is set in arch/arm/mach-bcm270X/bcm270X.c and will take presedence. Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
raspberrypi · Jun 2, 2015 · 8369d9b · 8369d9b
1 parent acc12c6
commit 8369d9b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
@@ -556,6 +556,7 @@ CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_TTY_PRINTK=y
 CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_BCM2708=m
 CONFIG_RAW_DRIVER=y
 CONFIG_BRCM_CHAR_DRIVERS=y
@@ -598,6 +599,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_BCM2835=y
 CONFIG_WATCHDOG=y
 CONFIG_BCM2708_WDT=m
+CONFIG_BCM2835_WDT=m
 CONFIG_UCB1400_CORE=m
 CONFIG_MFD_STMPE=y
 CONFIG_STMPE_SPI=y

diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
@@ -549,6 +549,7 @@ CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_TTY_PRINTK=y
 CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_BCM2708=m
 CONFIG_RAW_DRIVER=y
 CONFIG_BRCM_CHAR_DRIVERS=y
@@ -591,6 +592,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_BCM2835=y
 CONFIG_WATCHDOG=y
 CONFIG_BCM2708_WDT=m
+CONFIG_BCM2835_WDT=m
 CONFIG_UCB1400_CORE=m
 CONFIG_MFD_STMPE=y
 CONFIG_STMPE_SPI=y

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
@@ -90,7 +90,7 @@ config HW_RANDOM_BCM63XX
 
 config HW_RANDOM_BCM2835
 	tristate "Broadcom BCM2835 Random Number Generator support"
-	depends on ARCH_BCM2835
+	depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
 	default HW_RANDOM
 	---help---
 	  This driver provides kernel-side support for the Random Number

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
@@ -1222,7 +1222,7 @@ config BCM63XX_WDT
 
 config BCM2835_WDT
 	tristate "Broadcom BCM2835 hardware watchdog"
-	depends on ARCH_BCM2835
+	depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
 	select WATCHDOG_CORE
 	help
 	  Watchdog driver for the built in watchdog hardware in Broadcom