Merge tag 'davinci-for-v5.4/soc' of git://git.kernel.org/pub/scm/linux/kernel/git...

This converts all DaVinci SoCs except DM365 to use new clocksource
driver. DM365 conversion is still under debug and will be part of a
future pull request.

* tag 'davinci-for-v5.4/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: dm646x: Fix a typo in the comment
  ARM: davinci: dm646x: switch to using the clocksource driver
  ARM: davinci: dm644x: switch to using the clocksource driver
  ARM: davinci: dm355: switch to using the clocksource driver
  ARM: davinci: move timer definitions to davinci.h
  ARM: davinci: da830: switch to using the clocksource driver
  ARM: davinci: da850: switch to using the clocksource driver
  ARM: davinci: WARN_ON() if clk_get() fails
  ARM: davinci: enable the clocksource driver for DT mode

Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined arch/arm/Kconfig
index 1086a0e8083e105f985adc570ff6b0b11a84d51c,92ff58be1a43eb6c62bbf77fd95610ca63e376a1..14a3104243fd7f0406e0ccee2b0fe4ebbca7055c
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -263,6 -263,8 +263,6 @@@ config PHYS_OFFSE
        default 0x00000000 if ARCH_EBSA110 || \
                        ARCH_FOOTBRIDGE || \
                        ARCH_INTEGRATOR || \
 -                      ARCH_IOP13XX || \
 -                      ARCH_KS8695 || \
                        ARCH_REALVIEW
        default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
        default 0x20000000 if ARCH_S5PV210
@@@ -375,6 -377,19 +375,6 @@@ config ARCH_FOOTBRIDG
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
  
 -config ARCH_IOP13XX
 -      bool "IOP13xx-based"
 -      depends on MMU
 -      select CPU_XSC3
 -      select NEED_MACH_MEMORY_H
 -      select NEED_RET_TO_USER
 -      select FORCE_PCI
 -      select PLAT_IOP
 -      select VMSPLIT_1G
 -      select SPARSE_IRQ
 -      help
 -        Support for Intel's IOP13XX (XScale) family of processors.
 -
  config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU
@@@ -388,6 -403,18 +388,6 @@@
          Support for Intel's 80219 and IOP32X (XScale) family of
          processors.
  
 -config ARCH_IOP33X
 -      bool "IOP33x-based"
 -      depends on MMU
 -      select CPU_XSCALE
 -      select GPIO_IOP
 -      select GPIOLIB
 -      select NEED_RET_TO_USER
 -      select FORCE_PCI
 -      select PLAT_IOP
 -      help
 -        Support for Intel's IOP33X (XScale) family of processors.
 -
  config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU
@@@ -424,6 -451,48 +424,6 @@@ config ARCH_DOV
        help
          Support for the Marvell Dove SoC 88AP510
  
 -config ARCH_KS8695
 -      bool "Micrel/Kendin KS8695"
 -      select CLKSRC_MMIO
 -      select CPU_ARM922T
 -      select GENERIC_CLOCKEVENTS
 -      select GPIOLIB
 -      select NEED_MACH_MEMORY_H
 -      help
 -        Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
 -        System-on-Chip devices.
 -
 -config ARCH_W90X900
 -      bool "Nuvoton W90X900 CPU"
 -      select CLKDEV_LOOKUP
 -      select CLKSRC_MMIO
 -      select CPU_ARM926T
 -      select GENERIC_CLOCKEVENTS
 -      select GPIOLIB
 -      help
 -        Support for Nuvoton (Winbond logic dept.) ARM9 processor,
 -        At present, the w90x900 has been renamed nuc900, regarding
 -        the ARM series product line, you can login the following
 -        link address to know more.
 -
 -        <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
 -              ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
 -
 -config ARCH_LPC32XX
 -      bool "NXP LPC32XX"
 -      select ARM_AMBA
 -      select CLKDEV_LOOKUP
 -      select CLKSRC_LPC32XX
 -      select COMMON_CLK
 -      select CPU_ARM926T
 -      select GENERIC_CLOCKEVENTS
 -      select GENERIC_IRQ_MULTI_HANDLER
 -      select GPIOLIB
 -      select SPARSE_IRQ
 -      select USE_OF
 -      help
 -        Support for the NXP LPC32XX family of processors
 -
  config ARCH_PXA
        bool "PXA2xx/PXA3xx-based"
        depends on MMU
@@@ -514,6 -583,7 +514,7 @@@ config ARCH_DAVINC
        select ARCH_HAS_HOLES_MEMORYMODEL
        select COMMON_CLK
        select CPU_ARM926T
+       select DAVINCI_TIMER
        select GENERIC_ALLOCATOR
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
@@@ -665,13 -735,17 +666,13 @@@ source "arch/arm/mach-imx/Kconfig
  
  source "arch/arm/mach-integrator/Kconfig"
  
 -source "arch/arm/mach-iop13xx/Kconfig"
 -
  source "arch/arm/mach-iop32x/Kconfig"
  
 -source "arch/arm/mach-iop33x/Kconfig"
 -
  source "arch/arm/mach-ixp4xx/Kconfig"
  
  source "arch/arm/mach-keystone/Kconfig"
  
 -source "arch/arm/mach-ks8695/Kconfig"
 +source "arch/arm/mach-lpc32xx/Kconfig"
  
  source "arch/arm/mach-mediatek/Kconfig"
  
@@@ -757,6 -831,8 +758,6 @@@ source "arch/arm/plat-versatile/Kconfig
  
  source "arch/arm/mach-vt8500/Kconfig"
  
 -source "arch/arm/mach-w90x900/Kconfig"
 -
  source "arch/arm/mach-zx/Kconfig"
  
  source "arch/arm/mach-zynq/Kconfig"