diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:24:06 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:28:45 -0400 |
| commit | 19ce4f4a03e52bc694dc837a4a832111cb4271b3 (patch) | |
| tree | 79757bb645e035166ca012373992e185f8d07081 /arch/arm/plat-samsung | |
| parent | 228e3023eb0430b4b9ed0736f8f87c96a6cd9c7a (diff) | |
| parent | da821eb7d42935b0f7056d98c75fd1150f6636f4 (diff) | |
Merge tag 'clk-exynos-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim <kgene.kim@samsung.com>:
add suppport common clock framework for exynos
* tag 'clk-exynos-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (73 commits)
ARM: EXYNOS: fix compilation error introduced due to common clock migration
clk: exynos5250: Fix divider values for sclk_mmc{0,1,2,3}
clk: exynos4: export clocks required for fimc-is
clk: samsung: Fix compilation error
clk: exynos5250: register display block gate clocks to common clock framework
clk: exynos4: Add support for SoC-specific register save list
clk: exynos4: Add missing registers to suspend save list
clk: exynos4: Remove E4X12 prefix from SRC_DMC register
clk: exynos4: Add E4210 prefix to GATE_IP_PERIR register
clk: exynos4: Add E4210 prefix to LCD1 clock registers
clk: exynos4: Remove SoC-specific registers from save list
clk: exynos4: Use SRC_MASK_PERIL{0,1} definitions
clk: exynos4: Define {E,V}PLL registers
clk: exynos4: Add missing mout_sata on Exynos4210
clk: exynos4: Add missing CMU_TOP and ISP clocks
clk: exynos4: Add G3D clocks
clk: exynos4: Add camera related clock definitions
clk: exynos4: Export mout_core clock of Exynos4210
clk: samsung: Remove unimplemented ops for pll
clk: exynos4: Export clocks used by exynos cpufreq drivers
...
[arnd: add missing #address-cells property in mshc DT node]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index b708b3e56d27..6cb19c6aa9d6 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
| @@ -25,7 +25,7 @@ config PLAT_S5P | |||
| 25 | select PLAT_SAMSUNG | 25 | select PLAT_SAMSUNG |
| 26 | select S3C_GPIO_TRACK | 26 | select S3C_GPIO_TRACK |
| 27 | select S5P_GPIO_DRVSTR | 27 | select S5P_GPIO_DRVSTR |
| 28 | select SAMSUNG_CLKSRC | 28 | select SAMSUNG_CLKSRC if !COMMON_CLK |
| 29 | select SAMSUNG_GPIOLIB_4BIT | 29 | select SAMSUNG_GPIOLIB_4BIT |
| 30 | select SAMSUNG_IRQ_VIC_TIMER | 30 | select SAMSUNG_IRQ_VIC_TIMER |
| 31 | help | 31 | help |
| @@ -89,7 +89,7 @@ config SAMSUNG_CLKSRC | |||
| 89 | used by newer systems such as the S3C64XX. | 89 | used by newer systems such as the S3C64XX. |
| 90 | 90 | ||
| 91 | config S5P_CLOCK | 91 | config S5P_CLOCK |
| 92 | def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) | 92 | def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210) |
| 93 | help | 93 | help |
| 94 | Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs | 94 | Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs |
| 95 | 95 | ||