summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-30 14:30:27 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-30 21:49:05 +0100
commit6414261f0a2af00c6ffc80f847e9202344360bb4 (patch)
tree296c6ecf925299f7ae4d268052bdba8f08108515 /arch
parentASoC: Tegra I2S: Add device tree binding (diff)
downloadlinux-6414261f0a2af00c6ffc80f847e9202344360bb4.tar.xz
linux-6414261f0a2af00c6ffc80f847e9202344360bb4.zip
ASoC: Rename Speyside WM8962 to Tobermory
All the other machine drivers for non-default configurations are named after the relevant audio module so do so for Tobermory also. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c64xx/mach-crag6410.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index d04b65448510..55c0e75f5edc 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -282,8 +282,8 @@ static struct platform_device lowland_device = {
.id = -1,
};
-static struct platform_device speyside_wm8962_device = {
- .name = "speyside-wm8962",
+static struct platform_device tobermory_device = {
+ .name = "tobermory",
.id = -1,
};
@@ -338,7 +338,7 @@ static struct platform_device *crag6410_devices[] __initdata = {
&crag6410_lcd_powerdev,
&crag6410_backlight_device,
&speyside_device,
- &speyside_wm8962_device,
+ &tobermory_device,
&lowland_device,
&wallvdd_device,
};