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

diff --cc arch/arm/mach-bcm/Kconfig
index c9723d82cb301c26f4e66dfbfe36adeaac2b3177,3b2acf4fb760085eae2f59a2fa85864827acdb5a..7ef121472cdd4761d059ae9f3eaf26b04ac141a2
--- 1/arch/arm/mach-bcm/Kconfig
--- 2/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@@ -135,22 -122,21 +135,23 @@@ config ARCH_BCM_MOBILE_SM
  comment "Other Architectures"
  
  config ARCH_BCM2835
 -      bool "Broadcom BCM2835 family" if ARCH_MULTI_V6 || ARCH_MULTI_V7
 +      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" if ARCH_MULTI_V7
 +      bool "Broadcom BCM63xx DSL SoC"
 +      depends on ARCH_MULTI_V7
        depends on MMU
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369 if SMP