Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit bffc5ce3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next/timer-samsung' of...

Merge branch 'next/timer-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

From  Kukjin Kim <kgene.kim@samsung.com>:

Here is re-work samsung-time which was s5p-time to support
clocksource/clockevent API for s3c and s5pc100 timer driver. And this enables to
support high resolution timer and tickles mode on them.

Note, this depends on previous pull request (cleanup-s3c) because of touching
while s3c stuff.

* 'next/timer-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: SAMSUNG: Remove unused plat-samsung/time.c
  ARM: S5PC100: Add samsung-time support for s5pc100
  ARM: S3C64XX: Add samsung-time support for s3c64xx
  ARM: S3C24XX: Add samsung-time support for s3c24xx
  ARM: SAMSUNG: Rename s5p-time to samsung-time
  ARM: S3C24XX: cleanup the included soc init functions in common.h
  ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h
  ARM: S3C24XX: remove plat/irq.h in plat-samsung
  ARM: S3C24XX: plat/common-smdk.h local
  mmc: s3cmci: moved mach/regs-sdi.h into s3cmci device driver

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f6161aa1 ad38bdd1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment