Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into next/timer

Browse source

* 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms:
  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

...

This commit is contained in:

Arnd Bergmann 2012-03-13 14:18:04 +00:00

parent a2821146e6 d45785929f

commit 648ab3df21

38 changed files with 407 additions and 411 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

48

Documentation/devicetree/bindings/arm/twd.txt

View file

8

arch/arm/boot/dts/highbank.dts

View file

6

arch/arm/boot/dts/imx6q.dtsi

View file

37

arch/arm/include/asm/localtimer.h

View file

25

arch/arm/include/asm/smp_twd.h

View file

22

arch/arm/kernel/smp.c

View file

123

arch/arm/kernel/smp_twd.c

View file

18

arch/arm/mach-exynos/mct.c

View file

1

arch/arm/mach-highbank/Makefile

View file

3

arch/arm/mach-highbank/highbank.c

View file

40

arch/arm/mach-highbank/localtimer.c

View file

1

arch/arm/mach-imx/Makefile

View file

35

arch/arm/mach-imx/localtimer.c

View file

2

arch/arm/mach-imx/mach-imx6q.c

View file

79

arch/arm/mach-msm/timer.c

View file

1

arch/arm/mach-omap2/Makefile

View file

39

arch/arm/mach-omap2/timer-mpu.c

View file

22

arch/arm/mach-omap2/timer.c

View file

27

arch/arm/mach-realview/realview_eb.c

View file

21

arch/arm/mach-realview/realview_pb11mp.c

View file

20

arch/arm/mach-realview/realview_pbx.c

View file

1

arch/arm/mach-shmobile/Makefile

View file

2

arch/arm/mach-shmobile/include/mach/common.h

View file

26

arch/arm/mach-shmobile/localtimer.c

View file

1

arch/arm/mach-shmobile/platsmp.c

View file

8

arch/arm/mach-shmobile/smp-r8a7779.c

View file

8

arch/arm/mach-shmobile/smp-sh73a0.c

View file

10

arch/arm/mach-shmobile/timer.c

View file

2

arch/arm/mach-tegra/Makefile

View file

26

arch/arm/mach-tegra/localtimer.c

View file

22

arch/arm/mach-tegra/timer.c

View file

1

arch/arm/mach-ux500/Makefile

View file

1

arch/arm/mach-ux500/cpu.c

View file

29

arch/arm/mach-ux500/localtimer.c

View file

32

arch/arm/mach-ux500/timer.c

View file

17

arch/arm/mach-vexpress/ct-ca9x4.c

View file

1

arch/arm/plat-versatile/Makefile

View file

53

arch/arm/plat-versatile/localtimer.c

View file