Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Linus Torvalds [Tue, 27 Mar 2012 23:06:17 +0000 (16:06 -0700)]
Pull "ARM: timer cleanup work" from Arnd Bergmann:
 "These are split out from the generic soc and driver updates because
  there was a lot of conflicting work by multiple people.  Marc Zyngier
  worked on simplifying the "localtimer" interfaces, and some of the
  platforms are touching the same code as they move to device tree based
  booting.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>"

* tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)
  ARM: tegra: select USB_ULPI if USB is selected
  arm/tegra: pcie: fix return value of function
  ARM: ux500: fix compilation after local timer rework
  ARM: shmobile: remove additional __io() macro use
  ARM: local timers: make the runtime registration interface mandatory
  ARM: local timers: convert MSM to runtime registration interface
  ARM: local timers: convert exynos to runtime registration interface
  ARM: smp_twd: remove old local timer interface
  ARM: imx6q: convert to twd_local_timer_register() interface
  ARM: highbank: convert to twd_local_timer_register() interface
  ARM: ux500: convert to twd_local_timer_register() interface
  ARM: shmobile: convert to twd_local_timer_register() interface
  ARM: tegra: convert to twd_local_timer_register() interface
  ARM: plat-versatile: convert to twd_local_timer_register() interface
  ARM: OMAP4: convert to twd_local_timer_register() interface
  ARM: smp_twd: add device tree support
  ARM: smp_twd: add runtime registration support
  ARM: local timers: introduce a new registration interface
  ARM: smp_twd: make local_timer_stop a symbol instead of a #define
  ARM: mach-shmobile: default to no earlytimer
  ...

13 files changed:
1  2 
arch/arm/kernel/smp.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-bonito.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/setup-sh7372.c
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/pcie.c
arch/arm/mach-ux500/Makefile
arch/sh/kernel/cpu/sh4a/clock-sh7757.c
arch/sh/kernel/cpu/sh4a/clock-sh7785.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1043,10 -1063,14 +1063,16 @@@ void __init sh7372_add_standard_devices
        sh7372_add_device_to_domain(&sh7372_a4r, &veu2_device);
        sh7372_add_device_to_domain(&sh7372_a4r, &veu3_device);
        sh7372_add_device_to_domain(&sh7372_a4r, &jpu_device);
 +      sh7372_add_device_to_domain(&sh7372_a4r, &tmu00_device);
 +      sh7372_add_device_to_domain(&sh7372_a4r, &tmu01_device);
  }
  
+ static void __init sh7372_earlytimer_init(void)
+ {
+       sh7372_clock_init();
+       shmobile_earlytimer_init();
+ }
  void __init sh7372_add_early_devices(void)
  {
        early_platform_add_devices(sh7372_early_devices,
@@@ -7,10 -7,8 +7,10 @@@ config ARCH_TEGRA_2x_SO
        select CPU_V7
        select ARM_GIC
        select ARCH_REQUIRE_GPIOLIB
 +      select PINCTRL
 +      select PINCTRL_TEGRA20
        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-       select USB_ULPI if USB_SUPPORT
+       select USB_ULPI if USB
        select USB_ULPI_VIEWPORT if USB_SUPPORT
        select ARM_ERRATA_720789
        select ARM_ERRATA_742230
@@@ -29,10 -27,8 +29,10 @@@ config ARCH_TEGRA_3x_SO
        select CPU_V7
        select ARM_GIC
        select ARCH_REQUIRE_GPIOLIB
 +      select PINCTRL
 +      select PINCTRL_TEGRA30
        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-       select USB_ULPI if USB_SUPPORT
+       select USB_ULPI if USB
        select USB_ULPI_VIEWPORT if USB_SUPPORT
        select USE_OF
        select ARM_ERRATA_743622
Simple merge
Simple merge