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

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

arch/arm/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -770,8 +770,10 @@ config ARCH_SA1100 
config ARCH_S3C24XX

	bool "Samsung S3C24XX SoCs"

	select ARCH_HAS_CPUFREQ

	select ARCH_USES_GETTIMEOFFSET

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -788,10 +790,11 @@ config ARCH_S3C64XX 
	bool "Samsung S3C64XX"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	select ARM_VIC

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -825,9 +828,11 @@ config ARCH_S5P64X0 


config ARCH_S5PC100

	bool "Samsung S5PC100"

	select ARCH_USES_GETTIMEOFFSET

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

arch/arm/mach-exynos/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ config MACH_UNIVERSAL_C210 
	select S5P_DEV_ONENAND

	select S5P_DEV_TV

	select S5P_GPIO_INT

	select S5P_HRT

	select S5P_SETUP_MIPIPHY

	select SAMSUNG_HRT

	help

	  Machine support for Samsung Mobile Universal S5PC210 Reference

	  Board.

arch/arm/mach-exynos/mach-universal_c210.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <plat/mfc.h>

#include <plat/sdhci.h>

#include <plat/fimc-core.h>

#include <plat/s5p-time.h>

#include <plat/samsung-time.h>

#include <plat/camport.h>



#include <mach/map.h>
@@ -1094,7 +1094,7 @@ static void __init universal_map_io(void) 
	exynos_init_io(NULL, 0);

	s3c24xx_init_clocks(clk_xusbxti.rate);

	s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));

	s5p_set_timer_source(S5P_PWM2, S5P_PWM4);

	samsung_set_timer_source(SAMSUNG_PWM2, SAMSUNG_PWM4);

}



static void s5p_tv_setup(void)
@@ -1152,7 +1152,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") 
	.map_io		= universal_map_io,

	.init_machine	= universal_machine_init,

	.init_late	= exynos_init_late,

	.init_time	= s5p_timer_init,

	.init_time	= samsung_timer_init,

	.reserve        = &universal_reserve,

	.restart	= exynos4_restart,

MACHINE_END

arch/arm/mach-s3c24xx/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config CPU_S3C2410 
	select S3C2410_CLOCK

	select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX

	select S3C2410_PM if PM

	select SAMSUNG_HRT

	help

	  Support for S3C2410 and S3C2410A family from the S3C24XX line

	  of Samsung Mobile CPUs.
@@ -41,6 +42,7 @@ config CPU_S3C2412 
	select CPU_LLSERIAL_S3C2440

	select S3C2412_DMA if S3C24XX_DMA

	select S3C2412_PM if PM

	select SAMSUNG_HRT

	help

	  Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
@@ -53,6 +55,7 @@ config CPU_S3C2416 
	select S3C2443_COMMON

	select S3C2443_DMA if S3C24XX_DMA

	select SAMSUNG_CLKSRC

	select SAMSUNG_HRT

	help

	  Support for the S3C2416 SoC from the S3C24XX line
@@ -63,6 +66,7 @@ config CPU_S3C2440 
	select S3C2410_CLOCK

	select S3C2410_PM if PM

	select S3C2440_DMA if S3C24XX_DMA

	select SAMSUNG_HRT

	help

	  Support for S3C2440 Samsung Mobile CPU based systems.
@@ -72,6 +76,7 @@ config CPU_S3C2442 
	select CPU_LLSERIAL_S3C2440

	select S3C2410_CLOCK

	select S3C2410_PM if PM

	select SAMSUNG_HRT

	help

	  Support for S3C2442 Samsung Mobile CPU based systems.
@@ -87,6 +92,7 @@ config CPU_S3C2443 
	select S3C2443_COMMON

	select S3C2443_DMA if S3C24XX_DMA

	select SAMSUNG_CLKSRC

	select SAMSUNG_HRT

	help

	  Support for the S3C2443 SoC from the S3C24XX line

arch/arm/mach-s3c24xx/bast-irq.c

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#include <mach/hardware.h>

#include <mach/regs-irq.h>



#include <plat/irq.h>



#include "bast.h"



#define irqdbf(x...)