diff options
Diffstat (limited to 'arch/arm/mach-s3c2443')
-rw-r--r-- | arch/arm/mach-s3c2443/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2443/clock.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2443/mach-smdk2443.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2443/Kconfig b/arch/arm/mach-s3c2443/Kconfig index 31babec90cec..8814031516ce 100644 --- a/arch/arm/mach-s3c2443/Kconfig +++ b/arch/arm/mach-s3c2443/Kconfig | |||
@@ -25,7 +25,7 @@ config MACH_SMDK2443 | |||
25 | bool "SMDK2443" | 25 | bool "SMDK2443" |
26 | select CPU_S3C2443 | 26 | select CPU_S3C2443 |
27 | select MACH_SMDK | 27 | select MACH_SMDK |
28 | select S3C_DEV_HSMMC | 28 | select S3C_DEV_HSMMC1 |
29 | help | 29 | help |
30 | Say Y here if you are using an SMDK2443 | 30 | Say Y here if you are using an SMDK2443 |
31 | 31 | ||
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 0c3c0c884cd3..f4ec6d5715c8 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
@@ -196,7 +196,7 @@ static struct clksrc_clk clk_hsspi = { | |||
196 | static struct clksrc_clk clk_hsmmc_div = { | 196 | static struct clksrc_clk clk_hsmmc_div = { |
197 | .clk = { | 197 | .clk = { |
198 | .name = "hsmmc-div", | 198 | .name = "hsmmc-div", |
199 | .id = -1, | 199 | .id = 1, |
200 | .parent = &clk_esysclk.clk, | 200 | .parent = &clk_esysclk.clk, |
201 | }, | 201 | }, |
202 | .reg_div = { .reg = S3C2443_CLKDIV1, .size = 2, .shift = 6 }, | 202 | .reg_div = { .reg = S3C2443_CLKDIV1, .size = 2, .shift = 6 }, |
@@ -231,7 +231,7 @@ static int s3c2443_enable_hsmmc(struct clk *clk, int enable) | |||
231 | 231 | ||
232 | static struct clk clk_hsmmc = { | 232 | static struct clk clk_hsmmc = { |
233 | .name = "hsmmc-if", | 233 | .name = "hsmmc-if", |
234 | .id = -1, | 234 | .id = 1, |
235 | .parent = &clk_hsmmc_div.clk, | 235 | .parent = &clk_hsmmc_div.clk, |
236 | .enable = s3c2443_enable_hsmmc, | 236 | .enable = s3c2443_enable_hsmmc, |
237 | .ops = &(struct clk_ops) { | 237 | .ops = &(struct clk_ops) { |
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c index 4337f0a9960d..d3b2922517e0 100644 --- a/arch/arm/mach-s3c2443/mach-smdk2443.c +++ b/arch/arm/mach-s3c2443/mach-smdk2443.c | |||
@@ -105,7 +105,7 @@ static struct s3c2410_uartcfg smdk2443_uartcfgs[] __initdata = { | |||
105 | static struct platform_device *smdk2443_devices[] __initdata = { | 105 | static struct platform_device *smdk2443_devices[] __initdata = { |
106 | &s3c_device_wdt, | 106 | &s3c_device_wdt, |
107 | &s3c_device_i2c0, | 107 | &s3c_device_i2c0, |
108 | &s3c_device_hsmmc0, | 108 | &s3c_device_hsmmc1, |
109 | #ifdef CONFIG_SND_SOC_SMDK2443_WM9710 | 109 | #ifdef CONFIG_SND_SOC_SMDK2443_WM9710 |
110 | &s3c_device_ac97, | 110 | &s3c_device_ac97, |
111 | #endif | 111 | #endif |