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

Commit 995f1661 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'for_3.16/clk_cleanup' of... 

Merge branch 'for_3.16/clk_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tfiga/samsung-clk

 into v3.16-next/clk-samsung

Pull Samsung clock cleanup from Tomasz Figa:

"This pull requests contains minor clean-up related to Samsung clock
support, including:

1) move Kconfig entries of Samsung clock drivers to drivers/clk,

2) compile drivers/clk/samsung conditionally when COMMON_CLK_SAMSUNG is
selected,

3) remove obsolete Kconfig lines after moving s3c24xx to CCF."

Conflicts:
	arch/arm/mach-s3c24xx/Kconfig

Acked-by: default avatarMike Turquette <mturquette@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parents 6b262bf1 3bc0c5a1

Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ to specify the clock which they consume. Some of the clocks are available only 
on a particular SoC.



All available clocks are defined as preprocessor macros in

dt-bindings/clock/samsung,s3c2410-clock.h header and can be used in device

dt-bindings/clock/s3c2410.h header and can be used in device

tree sources.



External clocks:

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ config ARCH_S3C64XX 
	select ATAGS

	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

	select COMMON_CLK

	select COMMON_CLK_SAMSUNG

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG
@@ -835,7 +835,7 @@ config ARCH_EXYNOS 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_SPARSEMEM_ENABLE

	select ARM_GIC

	select COMMON_CLK

	select COMMON_CLK_SAMSUNG

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_S3C2410_I2C if I2C

arch/arm/mach-s3c24xx/Kconfig

+5 −32
Original line number Diff line number Diff line
@@ -18,17 +18,7 @@ config PLAT_S3C24XX 
	help

	  Base platform code for any Samsung S3C24XX device



config S3C2410_COMMON_CLK

	bool

	help

	  Build the s3c2410 clock driver based on the common clock framework.



config S3C2410_COMMON_DCLK

	bool

	select REGMAP_MMIO

	help

	  Temporary symbol to build the dclk driver based on the common clock

	  framework.



menu "SAMSUNG S3C24XX SoCs Support"
@@ -37,7 +27,6 @@ comment "S3C24XX SoCs" 
config CPU_S3C2410

	bool "SAMSUNG S3C2410"

	default y

	select COMMON_CLK

	select CPU_ARM920T

	select CPU_LLSERIAL_S3C2410

	select S3C2410_COMMON_CLK
@@ -51,7 +40,6 @@ config CPU_S3C2410 


config CPU_S3C2412

	bool "SAMSUNG S3C2412"

	select COMMON_CLK

	select CPU_ARM926T

	select CPU_LLSERIAL_S3C2440

	select S3C2412_COMMON_CLK
@@ -62,7 +50,6 @@ config CPU_S3C2412 


config CPU_S3C2416

	bool "SAMSUNG S3C2416/S3C2450"

	select COMMON_CLK

	select CPU_ARM926T

	select CPU_LLSERIAL_S3C2440

	select S3C2416_PM if PM
@@ -73,7 +60,6 @@ config CPU_S3C2416 


config CPU_S3C2440

	bool "SAMSUNG S3C2440"

	select COMMON_CLK

	select CPU_ARM920T

	select CPU_LLSERIAL_S3C2440

	select S3C2410_COMMON_CLK
@@ -84,7 +70,6 @@ config CPU_S3C2440 


config CPU_S3C2442

	bool "SAMSUNG S3C2442"

	select COMMON_CLK

	select CPU_ARM920T

	select CPU_LLSERIAL_S3C2440

	select S3C2410_COMMON_CLK
@@ -100,7 +85,6 @@ config CPU_S3C244X 


config CPU_S3C2443

	bool "SAMSUNG S3C2443"

	select COMMON_CLK

	select CPU_ARM920T

	select CPU_LLSERIAL_S3C2440

	select S3C2443_COMMON_CLK
@@ -264,7 +248,7 @@ config ARCH_BAST 
	bool "Simtec Electronics BAST (EB2410ITX)"

	select ISA

	select MACH_BAST_IDE

	select S3C2410_COMMON_DCLK if COMMON_CLK

	select S3C2410_COMMON_DCLK

	select S3C2410_IOTIMING if ARM_S3C2410_CPUFREQ

	select S3C24XX_SIMTEC_NOR

	select S3C24XX_SIMTEC_PM if PM
@@ -346,7 +330,7 @@ config MACH_TCT_HAMMER 
config MACH_VR1000

	bool "Thorcom VR1000"

	select MACH_BAST_IDE

	select S3C2410_COMMON_DCLK if COMMON_CLK

	select S3C2410_COMMON_DCLK

	select S3C24XX_SIMTEC_NOR

	select S3C24XX_SIMTEC_PM if PM

	select S3C24XX_SIMTEC_USB
@@ -365,11 +349,6 @@ config S3C2412_PM_SLEEP 


if CPU_S3C2412



config S3C2412_COMMON_CLK

	bool

	help

	  Build the s3c2412 clock driver based on the common clock framework.



config CPU_S3C2412_ONLY

	bool

	depends on !CPU_S3C2410 && !CPU_S3C2416 && !CPU_S3C2440 && \
@@ -530,7 +509,7 @@ comment "S3C2440 Boards" 
config MACH_ANUBIS

	bool "Simtec Electronics ANUBIS"

	select HAVE_PATA_PLATFORM

	select S3C2410_COMMON_DCLK if COMMON_CLK

	select S3C2410_COMMON_DCLK

	select S3C2440_XTAL_12000000

	select S3C24XX_SIMTEC_PM if PM

	select S3C_DEV_USB_HOST
@@ -569,7 +548,7 @@ config MACH_NEXCODER_2440 


config MACH_OSIRIS

	bool "Simtec IM2440D20 (OSIRIS) module"

	select S3C2410_COMMON_DCLK if COMMON_CLK

	select S3C2410_COMMON_DCLK

	select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ

	select S3C2440_XTAL_12000000

	select S3C24XX_SIMTEC_PM if PM
@@ -640,7 +619,7 @@ config MACH_RX1950 
	bool "HP iPAQ rx1950"

	select I2C

	select PM_H1940 if PM

	select S3C2410_COMMON_DCLK if COMMON_CLK

	select S3C2410_COMMON_DCLK

	select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ

	select S3C2440_XTAL_16934400

	select S3C24XX_PWM
@@ -652,12 +631,6 @@ endif # CPU_S3C2442 


if CPU_S3C2443 || CPU_S3C2416



config S3C2443_COMMON_CLK

	bool

	help

	  Temporary symbol to build the clock driver based on the common clock

	  framework.



config S3C2443_DMA

	bool

	help

drivers/clk/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -115,3 +115,5 @@ endmenu 


source "drivers/clk/bcm/Kconfig"

source "drivers/clk/mvebu/Kconfig"



source "drivers/clk/samsung/Kconfig"

drivers/clk/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ obj-$(CONFIG_PLAT_ORION) += mvebu/ 
obj-$(CONFIG_ARCH_MXS)			+= mxs/

obj-$(CONFIG_COMMON_CLK_QCOM)		+= qcom/

obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/

obj-$(CONFIG_PLAT_SAMSUNG)		+= samsung/

obj-$(CONFIG_COMMON_CLK_SAMSUNG)	+= samsung/

obj-$(CONFIG_ARCH_SHMOBILE_MULTI)	+= shmobile/

obj-$(CONFIG_ARCH_SIRF)			+= sirf/

obj-$(CONFIG_ARCH_SOCFPGA)		+= socfpga/