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

Commit fca9b5ea authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-clk-s3c64xx' of... 

Merge tag 'samsung-clk-s3c64xx' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

From Kukjin Kim:
Common clk support for S3C64XX
- add PLL for S3C64XX
- add s3c64xx clock driver
- update drivers to use CCF of s3c64xx

* tag 'samsung-clk-s3c64xx' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: S3C64XX: Remove old clock management code
  ARM: S3C64XX: Migrate clock handling to Common Clock Framework
  usb: ohci-s3c2410.c: Use clk_prepare_enable/clk_disable_unprepare
  ARM: S3C64XX: Use clk_prepare_enable/clk_disable_unprepare in dma.c
  ARM: SAMSUNG: Add soc_is_s3c6400/s3c6410 macros

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4a10c2ac 66fcbe6b

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -727,6 +727,7 @@ config ARCH_S3C64XX 
	select ARM_VIC

	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

	select COMMON_CLK

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG
@@ -740,7 +741,6 @@ config ARCH_S3C64XX 
	select S3C_DEV_NAND

	select S3C_GPIO_TRACK

	select SAMSUNG_ATAGS

	select SAMSUNG_CLKSRC

	select SAMSUNG_GPIOLIB_4BIT

	select SAMSUNG_WDT_RESET

	select USB_ARCH_HAS_OHCI

arch/arm/mach-s3c64xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ obj- := 


# Core



obj-y				+= common.o clock.o

obj-y				+= common.o



# Core support

arch/arm/mach-s3c64xx/clock.c

deleted100644 → 0
+0 −1007

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-s3c64xx/common.c

+17 −4

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-s3c64xx/common.h

+5 −7

File changed.

Preview size limit exceeded, changes collapsed.