summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p64x0/clock-s5p6440.c
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-11-19 00:49:44 +0100
committerKukjin Kim <kgene.kim@samsung.com>2010-11-19 00:49:44 +0100
commitd9a93c345a5503668ca2b3a75be0eba1131c90e4 (patch)
tree93df188933c3fa8525e03d3b13461a98df8e1b78 /arch/arm/mach-s5p64x0/clock-s5p6440.c
parentARM: S3C64XX: Upgrade platform device for I2S (diff)
downloadlinux-d9a93c345a5503668ca2b3a75be0eba1131c90e4.tar.xz
linux-d9a93c345a5503668ca2b3a75be0eba1131c90e4.zip
ARM: S5P64X0: Upgrade platform device for I2S
Add more information to I2S platform_devices in order to prepare them for new controller driver. Also, discard duplicated gpio-cfg. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0/clock-s5p6440.c')
-rw-r--r--arch/arm/mach-s5p64x0/clock-s5p6440.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c
index e4883dc1c8d7..409c5fc3670d 100644
--- a/arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c
@@ -261,7 +261,7 @@ static struct clk init_clocks_disable[] = {
.enable = s5p64x0_pclk_ctrl,
.ctrlbit = (1 << 25),
}, {
- .name = "i2s_v40",
+ .name = "iis",
.id = 0,
.parent = &clk_pclk_low.clk,
.enable = s5p64x0_pclk_ctrl,