From: Arnd Bergmann <arnd@arndb.de> To: Thomas Abraham <thomas.abraham@linaro.org> Cc: Kukjin Kim <kgene.kim@samsung.com>, Tushar Behera <tushar.behera@linaro.org>, Deepak Saxena <dsaxena@linaro.org>, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de> Subject: [PATCH 21/23] ARM: exynos: hack to disable private clock code Date: Tue, 5 Mar 2013 18:42:31 +0100 [thread overview] Message-ID: <1362505353-8873-22-git-send-email-arnd@arndb.de> (raw) In-Reply-To: <1362505353-8873-1-git-send-email-arnd@arndb.de> Multiplatform kernels rely on the common clock implementation, which conflicts with Samsung's own implementation of the same interface. This disables all code that provides or requires the nonstandard version. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-exynos/Makefile | 2 ++ arch/arm/mach-exynos/common.c | 6 ++++++ arch/arm/plat-samsung/clock-clksrc.c | 3 +++ arch/arm/plat-samsung/s5p-clock.c | 3 +++ drivers/cpufreq/Kconfig.arm | 4 +++- drivers/devfreq/Kconfig | 1 + 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 435757e..b0dcf7d 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -13,10 +13,12 @@ obj- := # Core obj-$(CONFIG_ARCH_EXYNOS) += common.o +ifdef CONFIG_SAMSUNG_CLOCK obj-$(CONFIG_ARCH_EXYNOS4) += clock-exynos4.o obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o obj-$(CONFIG_SOC_EXYNOS5250) += clock-exynos5.o +endif obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 4b4526d..504d50e 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -404,6 +404,9 @@ static void __init exynos5_map_io(void) static void __init exynos4_init_clocks(int xtal) { + if (!IS_ENABLED(CONFIG_SAMSUNG_CLOCK)) + return; + printk(KERN_DEBUG "%s: initializing clocks\n", __func__); s3c24xx_register_baseclocks(xtal); @@ -425,6 +428,9 @@ static void __init exynos5440_map_io(void) static void __init exynos5_init_clocks(int xtal) { + if (!IS_ENABLED(CONFIG_SAMSUNG_CLOCK)) + return; + printk(KERN_DEBUG "%s: initializing clocks\n", __func__); /* EXYNOS5440 can support only common clock framework */ diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c index 786a410..094fde9 100644 --- a/arch/arm/plat-samsung/clock-clksrc.c +++ b/arch/arm/plat-samsung/clock-clksrc.c @@ -179,6 +179,9 @@ void __init s3c_register_clksrc(struct clksrc_clk *clksrc, int size) { int ret; + if (!IS_ENABLED(CONFIG_SAMSUNG_CLOCK)) + return; + for (; size > 0; size--, clksrc++) { if (!clksrc->reg_div.reg && !clksrc->reg_src.reg) printk(KERN_ERR "%s: clock %s has no registers set\n", diff --git a/arch/arm/plat-samsung/s5p-clock.c b/arch/arm/plat-samsung/s5p-clock.c index 48a1599..0e22618 100644 --- a/arch/arm/plat-samsung/s5p-clock.c +++ b/arch/arm/plat-samsung/s5p-clock.c @@ -286,6 +286,9 @@ void __init s5p_register_clocks(unsigned long xtal_freq) { int ret; + if (!IS_ENABLED(CONFIG_SAMSUNG_CLOCK)) + return; + clk_ext_xtal_mux.rate = xtal_freq; ret = s3c24xx_register_clocks(s5p_clks, ARRAY_SIZE(s5p_clks)); diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 030ddf6..b6fb4fa 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -51,7 +51,7 @@ config ARM_S5PV210_CPUFREQ config ARM_EXYNOS_CPUFREQ bool "SAMSUNG EXYNOS SoCs" - depends on ARCH_EXYNOS + depends on ARCH_EXYNOS && SAMSUNG_CLOCK default y help This adds the CPUFreq driver common part for Samsung @@ -59,6 +59,7 @@ config ARM_EXYNOS_CPUFREQ If in doubt, say N. +if ARM_EXYNOS_CPUFREQ config ARM_EXYNOS4210_CPUFREQ def_bool CPU_EXYNOS4210 help @@ -76,6 +77,7 @@ config ARM_EXYNOS5250_CPUFREQ help This adds the CPUFreq driver for Samsung EXYNOS5250 SoC. +endif config ARM_KIRKWOOD_CPUFREQ def_bool ARCH_KIRKWOOD && OF diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig index 0f079be..d4f9a24 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -68,6 +68,7 @@ comment "DEVFREQ Drivers" config ARM_EXYNOS4_BUS_DEVFREQ bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver" depends on CPU_EXYNOS4210 || CPU_EXYNOS4212 || CPU_EXYNOS4412 + depends on SAMSUNG_CLOCK select ARCH_HAS_OPP select DEVFREQ_GOV_SIMPLE_ONDEMAND help -- 1.8.1.2
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 21/23] ARM: exynos: hack to disable private clock code Date: Tue, 5 Mar 2013 18:42:31 +0100 [thread overview] Message-ID: <1362505353-8873-22-git-send-email-arnd@arndb.de> (raw) In-Reply-To: <1362505353-8873-1-git-send-email-arnd@arndb.de> Multiplatform kernels rely on the common clock implementation, which conflicts with Samsung's own implementation of the same interface. This disables all code that provides or requires the nonstandard version. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-exynos/Makefile | 2 ++ arch/arm/mach-exynos/common.c | 6 ++++++ arch/arm/plat-samsung/clock-clksrc.c | 3 +++ arch/arm/plat-samsung/s5p-clock.c | 3 +++ drivers/cpufreq/Kconfig.arm | 4 +++- drivers/devfreq/Kconfig | 1 + 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 435757e..b0dcf7d 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -13,10 +13,12 @@ obj- := # Core obj-$(CONFIG_ARCH_EXYNOS) += common.o +ifdef CONFIG_SAMSUNG_CLOCK obj-$(CONFIG_ARCH_EXYNOS4) += clock-exynos4.o obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o obj-$(CONFIG_SOC_EXYNOS5250) += clock-exynos5.o +endif obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 4b4526d..504d50e 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -404,6 +404,9 @@ static void __init exynos5_map_io(void) static void __init exynos4_init_clocks(int xtal) { + if (!IS_ENABLED(CONFIG_SAMSUNG_CLOCK)) + return; + printk(KERN_DEBUG "%s: initializing clocks\n", __func__); s3c24xx_register_baseclocks(xtal); @@ -425,6 +428,9 @@ static void __init exynos5440_map_io(void) static void __init exynos5_init_clocks(int xtal) { + if (!IS_ENABLED(CONFIG_SAMSUNG_CLOCK)) + return; + printk(KERN_DEBUG "%s: initializing clocks\n", __func__); /* EXYNOS5440 can support only common clock framework */ diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c index 786a410..094fde9 100644 --- a/arch/arm/plat-samsung/clock-clksrc.c +++ b/arch/arm/plat-samsung/clock-clksrc.c @@ -179,6 +179,9 @@ void __init s3c_register_clksrc(struct clksrc_clk *clksrc, int size) { int ret; + if (!IS_ENABLED(CONFIG_SAMSUNG_CLOCK)) + return; + for (; size > 0; size--, clksrc++) { if (!clksrc->reg_div.reg && !clksrc->reg_src.reg) printk(KERN_ERR "%s: clock %s has no registers set\n", diff --git a/arch/arm/plat-samsung/s5p-clock.c b/arch/arm/plat-samsung/s5p-clock.c index 48a1599..0e22618 100644 --- a/arch/arm/plat-samsung/s5p-clock.c +++ b/arch/arm/plat-samsung/s5p-clock.c @@ -286,6 +286,9 @@ void __init s5p_register_clocks(unsigned long xtal_freq) { int ret; + if (!IS_ENABLED(CONFIG_SAMSUNG_CLOCK)) + return; + clk_ext_xtal_mux.rate = xtal_freq; ret = s3c24xx_register_clocks(s5p_clks, ARRAY_SIZE(s5p_clks)); diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 030ddf6..b6fb4fa 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -51,7 +51,7 @@ config ARM_S5PV210_CPUFREQ config ARM_EXYNOS_CPUFREQ bool "SAMSUNG EXYNOS SoCs" - depends on ARCH_EXYNOS + depends on ARCH_EXYNOS && SAMSUNG_CLOCK default y help This adds the CPUFreq driver common part for Samsung @@ -59,6 +59,7 @@ config ARM_EXYNOS_CPUFREQ If in doubt, say N. +if ARM_EXYNOS_CPUFREQ config ARM_EXYNOS4210_CPUFREQ def_bool CPU_EXYNOS4210 help @@ -76,6 +77,7 @@ config ARM_EXYNOS5250_CPUFREQ help This adds the CPUFreq driver for Samsung EXYNOS5250 SoC. +endif config ARM_KIRKWOOD_CPUFREQ def_bool ARCH_KIRKWOOD && OF diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig index 0f079be..d4f9a24 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -68,6 +68,7 @@ comment "DEVFREQ Drivers" config ARM_EXYNOS4_BUS_DEVFREQ bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver" depends on CPU_EXYNOS4210 || CPU_EXYNOS4212 || CPU_EXYNOS4412 + depends on SAMSUNG_CLOCK select ARCH_HAS_OPP select DEVFREQ_GOV_SIMPLE_ONDEMAND help -- 1.8.1.2
next prev parent reply other threads:[~2013-03-05 17:42 UTC|newest] Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-03-05 17:42 [PATCH 00/23] RFC: exynos multiplatform support Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 01/23] ARM: exynos: introduce EXYNOS_ATAGS symbol Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 02/23] irqchip: exynos: remove dependency on mach/irqs.h Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 03/23] tty: serial/samsung: prepare for common clock API Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 04/23] tty: serial/samsung: make register definitions global Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 05/23] tty: serial/samsung: fix modular build Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 06/23] ARM: exynos: move debug-macro.S to include/debug/ Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 07/23] i2c: s3c2410: make header file local Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-04-02 20:36 ` Heiko Stübner 2013-04-02 20:36 ` Heiko Stübner 2013-03-05 17:42 ` [PATCH 08/23] mmc: sdhci-s3c: remove platform dependencies Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 09/23] usb: exynos: do not include plat/usb-phy.h Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 10/23] [media] exynos: remove unnecessary header inclusions Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-04-02 13:08 ` Sylwester Nawrocki 2013-04-02 13:08 ` Sylwester Nawrocki 2013-04-02 13:17 ` Sylwester Nawrocki 2013-03-05 17:42 ` [PATCH 11/23] video/exynos: " Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 12/23] thermal/exynos: " Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 13/23] mtd: onenand/samsung: make regs-onenand.h file local Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 14/23] rtc: s3c: make header " Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 15/23] spi: s3c64xx: move to generic dmaengine API Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-06 9:14 ` Padma Venkat 2013-03-06 9:14 ` Padma Venkat 2013-03-05 17:42 ` [PATCH 16/23] pwm: samsung: repair the worst MMIO abuses Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 17/23] ASoC: samsung: move plat/ headers to local directory Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 18/23] ASoC: samsung: convert to dmaengine API Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-06 8:58 ` Padma Venkat 2013-03-06 8:58 ` Padma Venkat 2013-03-06 12:01 ` Arnd Bergmann 2013-03-06 12:01 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 19/23] ASoC: samsung: use irq resource for idma Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 20/23] ARM: exynos: prepare for sparse IRQ Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann [this message] 2013-03-05 17:42 ` [PATCH 21/23] ARM: exynos: hack to disable private clock code Arnd Bergmann 2013-03-05 17:42 ` [PATCH 22/23] ARM: exynos: work around missing gpio code on multiplatform Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 17:42 ` [PATCH 23/23] ARM: exynos: experimental multiplatform support Arnd Bergmann 2013-03-05 17:42 ` Arnd Bergmann 2013-03-05 18:27 ` [PATCH 00/23] RFC: exynos " Tony Lindgren 2013-03-05 18:27 ` Tony Lindgren 2013-03-05 18:28 ` Tomasz Figa 2013-03-05 18:28 ` Tomasz Figa 2013-03-05 19:19 ` Arnd Bergmann 2013-03-05 19:19 ` Arnd Bergmann 2013-03-05 22:48 ` Tomasz Figa 2013-03-05 22:48 ` Tomasz Figa 2013-03-06 10:50 ` Arnd Bergmann 2013-03-06 10:50 ` Arnd Bergmann 2013-03-06 12:34 ` Thierry Reding 2013-03-06 12:34 ` Thierry Reding 2013-03-06 22:57 ` Tomasz Figa 2013-03-06 22:57 ` Tomasz Figa 2013-03-07 3:02 ` Arnd Bergmann 2013-03-07 3:02 ` Arnd Bergmann 2013-03-07 7:22 ` Thierry Reding 2013-03-07 7:22 ` Thierry Reding 2013-03-08 0:40 ` Tomasz Figa 2013-03-08 0:40 ` Tomasz Figa 2013-03-08 12:52 ` Arnd Bergmann 2013-03-08 12:52 ` Arnd Bergmann 2013-03-06 22:14 ` Heiko Stübner 2013-03-06 22:14 ` Heiko Stübner 2013-03-06 22:55 ` Tomasz Figa 2013-03-06 22:55 ` Tomasz Figa 2013-03-05 20:50 ` Heiko Stübner 2013-03-05 20:50 ` Heiko Stübner 2013-03-05 21:24 ` Arnd Bergmann 2013-03-05 21:24 ` Arnd Bergmann 2013-03-05 21:54 ` Arnd Bergmann 2013-03-05 21:54 ` Arnd Bergmann 2013-03-05 22:12 ` Tomasz Figa 2013-03-05 22:12 ` Tomasz Figa 2013-03-05 22:21 ` Arnd Bergmann 2013-03-05 22:21 ` Arnd Bergmann 2013-03-05 22:25 ` Heiko Stübner 2013-03-05 22:25 ` Heiko Stübner 2013-03-05 22:43 ` Arnd Bergmann 2013-03-05 22:43 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1362505353-8873-22-git-send-email-arnd@arndb.de \ --to=arnd@arndb.de \ --cc=dsaxena@linaro.org \ --cc=kgene.kim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=olof@lixom.net \ --cc=thomas.abraham@linaro.org \ --cc=tushar.behera@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.