Skip to contentSkip to conversation

ASoC: Rename Speyside WM8962 to Tobermory

PATCH New Mark Brown 1 participant 1 message Nov 30, 2011

Subsystems (6)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 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.

---
 arch/arm/mach-s3c64xx/mach-crag6410.c |    6 +-
 sound/soc/samsung/Kconfig             |    4 +-
 sound/soc/samsung/Makefile            |    4 +-
 sound/soc/samsung/speyside_wm8962.c   |  257 ---------------------------------
 sound/soc/samsung/tobermory.c         |  257 +++++++++++++++++++++++++++++++++
 5 files changed, 264 insertions(+), 264 deletions(-)
 delete mode 100644 sound/soc/samsung/speyside_wm8962.c
 create mode 100644 sound/soc/samsung/tobermory.c
arch/arm/mach-s3c64xx/mach-crag6410.c +3 -3
index 633f729..4ce4a74 100644
@@ -286,8 +286,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,
 };
 
@@ -347,7 +347,7 @@ static struct platform_device *crag6410_devices[] __initdata = {
 	&crag6410_lcd_powerdev,
 	&crag6410_backlight_device,
 	&speyside_device,
-	&speyside_wm8962_device,
+	&tobermory_device,
 	&littlemill_device,
 	&lowland_device,
 	&wallvdd_device,
sound/soc/samsung/Kconfig +2 -2
index 9634564..f5a857f 100644
@@ -194,8 +194,8 @@ config SND_SOC_SPEYSIDE
 	select SND_SOC_WM1250_EV1
 	select SND_SOC_WM0010
 
-config SND_SOC_SPEYSIDE_WM8962
-	tristate "Audio support for Wolfson Speyside with WM8962"
+config SND_SOC_TOBERMORY
+	tristate "Audio support for Wolfson Tobermory"
 	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
 	select SND_SAMSUNG_I2S
 	select SND_SOC_WM8962
sound/soc/samsung/Makefile +2 -2
index c9564e3..9d03beb 100644
@@ -39,7 +39,7 @@ snd-soc-smdk-spdif-objs := smdk_spdif.o
 snd-soc-smdk-wm8580pcm-objs := smdk_wm8580pcm.o
 snd-soc-smdk-wm8994pcm-objs := smdk_wm8994pcm.o
 snd-soc-speyside-objs := speyside.o
-snd-soc-speyside-wm8962-objs := speyside_wm8962.o
+snd-soc-tobermory-objs := tobermory.o
 snd-soc-lowland-objs := lowland.o
 snd-soc-littlemill-objs := littlemill.o
 
@@ -62,6 +62,6 @@ obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o
 obj-$(CONFIG_SND_SOC_SMDK_WM8580_PCM) += snd-soc-smdk-wm8580pcm.o
 obj-$(CONFIG_SND_SOC_SMDK_WM8994_PCM) += snd-soc-smdk-wm8994pcm.o
 obj-$(CONFIG_SND_SOC_SPEYSIDE) += snd-soc-speyside.o
-obj-$(CONFIG_SND_SOC_SPEYSIDE_WM8962) += snd-soc-speyside-wm8962.o
+obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o
 obj-$(CONFIG_SND_SOC_LOWLAND) += snd-soc-lowland.o
 obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o
sound/soc/samsung/speyside_wm8962.c deleted +0 -257

257 lines not on this page · raw message

sound/soc/samsung/tobermory.c new file +257 -0

257 lines not on this page · raw message

Signature · 1 line
1.7.7.3