diff options
author | Heiko Stuebner <heiko@sntech.de> | 2011-09-26 19:45:23 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 06:01:29 -0400 |
commit | 8b069b7709c6b5d1492342164976ebfa178de31f (patch) | |
tree | ca80099c242687cda07b4e601e06faa264ce810b | |
parent | 4a43c666129f67b5bcc79fa59edb48c39fea75a0 (diff) |
ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
This clock is common to S3C2443/2416/2450.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-s3c2443/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/s3c2443-clock.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 27549c4fc7b9..cd51d04e1de7 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
@@ -169,7 +169,7 @@ static struct clksrc_clk clk_arm = { | |||
169 | 169 | ||
170 | static struct clksrc_clk clk_hsspi = { | 170 | static struct clksrc_clk clk_hsspi = { |
171 | .clk = { | 171 | .clk = { |
172 | .name = "hsspi", | 172 | .name = "hsspi-if", |
173 | .parent = &clk_esysclk.clk, | 173 | .parent = &clk_esysclk.clk, |
174 | .ctrlbit = S3C2443_SCLKCON_HSSPICLK, | 174 | .ctrlbit = S3C2443_SCLKCON_HSSPICLK, |
175 | .enable = s3c2443_clkcon_enable_s, | 175 | .enable = s3c2443_clkcon_enable_s, |
diff --git a/arch/arm/plat-s3c24xx/s3c2443-clock.c b/arch/arm/plat-s3c24xx/s3c2443-clock.c index f630adfaf5b2..07a4c81587ac 100644 --- a/arch/arm/plat-s3c24xx/s3c2443-clock.c +++ b/arch/arm/plat-s3c24xx/s3c2443-clock.c | |||
@@ -258,6 +258,11 @@ static struct clk init_clocks_off[] = { | |||
258 | .enable = s3c2443_clkcon_enable_p, | 258 | .enable = s3c2443_clkcon_enable_p, |
259 | .ctrlbit = S3C2443_PCLKCON_IIS, | 259 | .ctrlbit = S3C2443_PCLKCON_IIS, |
260 | }, { | 260 | }, { |
261 | .name = "hsspi", | ||
262 | .parent = &clk_p, | ||
263 | .enable = s3c2443_clkcon_enable_p, | ||
264 | .ctrlbit = S3C2443_PCLKCON_HSSPI, | ||
265 | }, { | ||
261 | .name = "adc", | 266 | .name = "adc", |
262 | .parent = &clk_p, | 267 | .parent = &clk_p, |
263 | .enable = s3c2443_clkcon_enable_p, | 268 | .enable = s3c2443_clkcon_enable_p, |