Merge tag 'arm-soc/for-5.7/soc-arm64' of https://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Wed, 25 Mar 2020 19:55:14 +0000 (20:55 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 25 Mar 2020 19:55:15 +0000 (20:55 +0100)
This pull request contains Broadcom ARM64 SoCs changes for 5.7, please
pull the following:

- Geert drops the non-existent HAVE_ARM_ARCH_TIMER symbol select for
  ARCH_BCM2835

* tag 'arm-soc/for-5.7/soc-arm64' of https://github.com/Broadcom/stblinux:
  arm64: bcm2835: Drop select of nonexistent HAVE_ARM_ARCH_TIMER

Link: https://lore.kernel.org/r/20200311212012.9418-4-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm64/Kconfig.platforms

index b2b504e..ad43351 100644 (file)
@@ -39,7 +39,6 @@ config ARCH_BCM2835
        select ARM_AMBA
        select ARM_GIC
        select ARM_TIMER_SP804
-       select HAVE_ARM_ARCH_TIMER
        help
          This enables support for the Broadcom BCM2837 and BCM2711 SoC.
          These SoCs are used in the Raspberry Pi 3 and 4 devices.