From: "Heiko Stübner" <heiko@sntech.de>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: mturquette@linaro.org, linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
Thomas Abraham <thomas.abraham@linaro.org>,
t.figa@samsung.com, Russell King <linux@arm.linux.org.uk>
Subject: [PATCH v2 4/6] ARM: S3C24XX: enable legacy clock code only when SAMSUNG_CLOCK selected
Date: Wed, 10 Jul 2013 00:59:32 +0200 [thread overview]
Message-ID: <201307100059.32401.heiko@sntech.de> (raw)
In-Reply-To: <201307100057.06061.heiko@sntech.de>
This enables a smooth transition, as not all S3C24XX SoCs need to be
converted at the same time and can instead simply exchange their
select SAMSUNG_CLOCK with a select COMMON_CLK after the conversion.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/mach-s3c24xx/common-s3c2443.c | 2 ++
arch/arm/mach-s3c24xx/common.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/arch/arm/mach-s3c24xx/common-s3c2443.c b/arch/arm/mach-s3c24xx/common-s3c2443.c
index f6b9f2e..b5bbeb7 100644
--- a/arch/arm/mach-s3c24xx/common-s3c2443.c
+++ b/arch/arm/mach-s3c24xx/common-s3c2443.c
@@ -28,6 +28,7 @@
#include <plat/cpu-freq.h>
+#ifdef CONFIG_SAMSUNG_CLOCK
static int s3c2443_gate(void __iomem *reg, struct clk *clk, int enable)
{
u32 ctrlbit = clk->ctrlbit;
@@ -673,3 +674,4 @@ void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll,
s3c2443_common_setup_clocks(get_mpll);
}
+#endif
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index 457261c..0fe0254 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -317,6 +317,7 @@ struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {
/* initialise all the clocks */
+#ifdef CONFIG_SAMSUNG_CLOCK
void __init_or_cpufreq s3c24xx_setup_clocks(unsigned long fclk,
unsigned long hclk,
unsigned long pclk)
@@ -329,3 +330,4 @@ void __init_or_cpufreq s3c24xx_setup_clocks(unsigned long fclk,
clk_p.rate = pclk;
clk_f.rate = fclk;
}
+#endif
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/6] ARM: S3C24XX: enable legacy clock code only when SAMSUNG_CLOCK selected
Date: Wed, 10 Jul 2013 00:59:32 +0200 [thread overview]
Message-ID: <201307100059.32401.heiko@sntech.de> (raw)
In-Reply-To: <201307100057.06061.heiko@sntech.de>
This enables a smooth transition, as not all S3C24XX SoCs need to be
converted at the same time and can instead simply exchange their
select SAMSUNG_CLOCK with a select COMMON_CLK after the conversion.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/mach-s3c24xx/common-s3c2443.c | 2 ++
arch/arm/mach-s3c24xx/common.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/arch/arm/mach-s3c24xx/common-s3c2443.c b/arch/arm/mach-s3c24xx/common-s3c2443.c
index f6b9f2e..b5bbeb7 100644
--- a/arch/arm/mach-s3c24xx/common-s3c2443.c
+++ b/arch/arm/mach-s3c24xx/common-s3c2443.c
@@ -28,6 +28,7 @@
#include <plat/cpu-freq.h>
+#ifdef CONFIG_SAMSUNG_CLOCK
static int s3c2443_gate(void __iomem *reg, struct clk *clk, int enable)
{
u32 ctrlbit = clk->ctrlbit;
@@ -673,3 +674,4 @@ void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll,
s3c2443_common_setup_clocks(get_mpll);
}
+#endif
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index 457261c..0fe0254 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -317,6 +317,7 @@ struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {
/* initialise all the clocks */
+#ifdef CONFIG_SAMSUNG_CLOCK
void __init_or_cpufreq s3c24xx_setup_clocks(unsigned long fclk,
unsigned long hclk,
unsigned long pclk)
@@ -329,3 +330,4 @@ void __init_or_cpufreq s3c24xx_setup_clocks(unsigned long fclk,
clk_p.rate = pclk;
clk_f.rate = fclk;
}
+#endif
--
1.7.10.4
next prev parent reply other threads:[~2013-07-09 22:59 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-09 22:57 [PATCH v2 0/6] Convert S3C2416 ad S3C2443 to common clock framework Heiko Stübner
2013-07-09 22:57 ` Heiko Stübner
2013-07-09 22:57 ` [PATCH v2 1/6] clk: samsung: move common plls registration into separate function Heiko Stübner
2013-07-09 22:57 ` Heiko Stübner
2013-07-10 16:59 ` Yadwinder Singh Brar
2013-07-10 16:59 ` Yadwinder Singh Brar
2013-07-11 7:46 ` Tomasz Figa
2013-07-11 7:46 ` Tomasz Figa
2013-07-11 8:52 ` Heiko Stübner
2013-07-11 8:52 ` Heiko Stübner
2013-08-02 21:35 ` Mike Turquette
2013-08-02 21:35 ` Mike Turquette
2013-07-09 22:58 ` [PATCH v2 2/6] clk: samsung: fix error handling in pll register functions Heiko Stübner
2013-07-09 22:58 ` Heiko Stübner
2013-07-11 7:50 ` Tomasz Figa
2013-07-11 7:50 ` Tomasz Figa
2013-07-09 22:59 ` [PATCH v2 3/6] clk: samsung: add plls used in s3c2416 and s3c2443 Heiko Stübner
2013-07-09 22:59 ` Heiko Stübner
2013-07-11 8:16 ` Tomasz Figa
2013-07-11 8:16 ` Tomasz Figa
2013-07-11 8:50 ` Heiko Stübner
2013-07-11 8:50 ` Heiko Stübner
2013-07-11 9:25 ` Tomasz Figa
2013-07-11 9:25 ` Tomasz Figa
2013-07-09 22:59 ` Heiko Stübner [this message]
2013-07-09 22:59 ` [PATCH v2 4/6] ARM: S3C24XX: enable legacy clock code only when SAMSUNG_CLOCK selected Heiko Stübner
2013-07-09 23:00 ` [PATCH v2 5/6] clk: samsung: add clock-driver for s3c2416, s3c2443 and s3c2450 Heiko Stübner
2013-07-09 23:00 ` Heiko Stübner
2013-07-11 9:13 ` Tomasz Figa
2013-07-11 9:13 ` Tomasz Figa
2013-07-09 23:00 ` [PATCH v2 6/6] ARM: S3C24XX: Convert s3c2416 and s3c2443 to common clock framework Heiko Stübner
2013-07-09 23:00 ` Heiko Stübner
2013-07-16 7:09 ` Kukjin Kim
2013-07-16 7:09 ` Kukjin Kim
2013-07-22 17:07 ` Tomasz Figa
2013-07-22 17:07 ` Tomasz Figa
2013-07-24 12:59 ` Kukjin Kim
2013-07-24 12:59 ` Kukjin Kim
2013-07-24 14:01 ` Tomasz Figa
2013-07-24 14:01 ` Tomasz Figa
2013-08-05 17:03 ` Kukjin Kim
2013-08-05 17:03 ` Kukjin Kim
2013-07-10 8:47 ` [PATCH v2 0/6] Convert S3C2416 ad S3C2443 " Thomas Abraham
2013-07-10 8:47 ` Thomas Abraham
2013-08-05 17:05 ` Kukjin Kim
2013-08-05 17:05 ` Kukjin Kim
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=201307100059.32401.heiko@sntech.de \
--to=heiko@sntech.de \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mturquette@linaro.org \
--cc=t.figa@samsung.com \
--cc=thomas.abraham@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: link
Be 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.