Merge tag 'bcm2835-soc-next-2015-12-28' of http://github.com/anholt/linux into next/soc

Merge "BCM2835 SOC changes for 4.5" from Eric Anholt:

This pull request includes the bcm2835 changes for 4.5 targeting the
arm-soc next/soc branch.

* tag 'bcm2835-soc-next-2015-12-28' of http://github.com/anholt/linux:
  ARM: bcm2835: Add Kconfig support for bcm2836
  ARM: bcm2835: Add a compat string for bcm2836 machine probe
  dt-bindings: Add root properties for Raspberry Pi 2

Conflicts:
	arch/arm/mach-bcm/Kconfig

2 files changed, 10 insertions, 4 deletions

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index c9723d82cb30..7ef121472cdd 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -136,17 +136,18 @@ comment "Other Architectures"
 
 config ARCH_BCM2835
         bool "Broadcom BCM2835 family"
-        depends on ARCH_MULTI_V6
+        depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
         select ARCH_REQUIRE_GPIOLIB
         select ARM_AMBA
-        select ARM_ERRATA_411920
+        select ARM_ERRATA_411920 if ARCH_MULTI_V6
         select ARM_TIMER_SP804
+        select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
         select CLKSRC_OF
         select PINCTRL
         select PINCTRL_BCM2835
         help
-          This enables support for the Broadcom BCM2835 SoC. This SoC is
-          used in the Raspberry Pi and Roku 2 devices.
+          This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
+          This SoC is used in the Raspberry Pi and Roku 2 devices.
 
 config ARCH_BCM_63XX
         bool "Broadcom BCM63xx DSL SoC"
diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
index 0f7b9eac3d15..834d67684e20 100644
--- a/arch/arm/mach-bcm/board_bcm2835.c
+++ b/arch/arm/mach-bcm/board_bcm2835.c
@@ -36,7 +36,12 @@ static void __init bcm2835_init(void)
 }
 
 static const char * const bcm2835_compat[] = {
+#ifdef CONFIG_ARCH_MULTI_V6
         "brcm,bcm2835",
+#endif
+#ifdef CONFIG_ARCH_MULTI_V7
+        "brcm,bcm2836",
+#endif
         NULL
 };