Skip to content

L
linux
Commit 6414261f authored by Mark Brown's avatar Mark Brown
Browse files
Options

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent bf55499e
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
arch/arm/mach-s3c64xx/mach-crag6410.c
View file @ 6414261f
...@@ -282,8 +282,8 @@ static struct platform_device lowland_device = { ...@@ -282,8 +282,8 @@ static struct platform_device lowland_device = {
.id = -1, .id = -1,
}; };
static struct platform_device speyside_wm8962_device = { static struct platform_device tobermory_device = {
.name = "speyside-wm8962", .name = "tobermory",
.id = -1, .id = -1,
}; };
...@@ -338,7 +338,7 @@ static struct platform_device *crag6410_devices[] __initdata = { ...@@ -338,7 +338,7 @@ static struct platform_device *crag6410_devices[] __initdata = {
&crag6410_lcd_powerdev, &crag6410_lcd_powerdev,
&crag6410_backlight_device, &crag6410_backlight_device,
&speyside_device, &speyside_device,
&speyside_wm8962_device, &tobermory_device,
&lowland_device, &lowland_device,
&wallvdd_device, &wallvdd_device,
}; };
......
sound/soc/samsung/Kconfig
View file @ 6414261f
...@@ -193,8 +193,8 @@ config SND_SOC_SPEYSIDE ...@@ -193,8 +193,8 @@ config SND_SOC_SPEYSIDE
select SND_SOC_WM9081 select SND_SOC_WM9081
select SND_SOC_WM1250_EV1 select SND_SOC_WM1250_EV1
config SND_SOC_SPEYSIDE_WM8962 config SND_SOC_TOBERMORY
tristate "Audio support for Wolfson Speyside with WM8962" tristate "Audio support for Wolfson Tobermory"
depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
select SND_SAMSUNG_I2S select SND_SAMSUNG_I2S
select SND_SOC_WM8962 select SND_SOC_WM8962
......
sound/soc/samsung/Makefile
View file @ 6414261f
...@@ -39,7 +39,7 @@ snd-soc-smdk-spdif-objs := smdk_spdif.o ...@@ -39,7 +39,7 @@ snd-soc-smdk-spdif-objs := smdk_spdif.o
snd-soc-smdk-wm8580pcm-objs := smdk_wm8580pcm.o snd-soc-smdk-wm8580pcm-objs := smdk_wm8580pcm.o
snd-soc-smdk-wm8994pcm-objs := smdk_wm8994pcm.o snd-soc-smdk-wm8994pcm-objs := smdk_wm8994pcm.o
snd-soc-speyside-objs := speyside.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-lowland-objs := lowland.o
snd-soc-littlemill-objs := littlemill.o snd-soc-littlemill-objs := littlemill.o
...@@ -62,6 +62,6 @@ obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.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_WM8580_PCM) += snd-soc-smdk-wm8580pcm.o
obj-$(CONFIG_SND_SOC_SMDK_WM8994_PCM) += snd-soc-smdk-wm8994pcm.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) += 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_LOWLAND) += snd-soc-lowland.o
obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o
sound/soc/samsung/speyside_wm8962.c → sound/soc/samsung/tobermory.c
View file @ 6414261f
/* /*
* Speyside with WM8962 audio support * Tobermory audio support
* *
* Copyright 2011 Wolfson Microelectronics * Copyright 2011 Wolfson Microelectronics
* *
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
static int sample_rate = 44100; static int sample_rate = 44100;
static int speyside_wm8962_set_bias_level(struct snd_soc_card *card, static int tobermory_set_bias_level(struct snd_soc_card *card,
struct snd_soc_dapm_context *dapm, struct snd_soc_dapm_context *dapm,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
...@@ -56,7 +56,7 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card, ...@@ -56,7 +56,7 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card,
return 0; return 0;
} }
static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card, static int tobermory_set_bias_level_post(struct snd_soc_card *card,
struct snd_soc_dapm_context *dapm, struct snd_soc_dapm_context *dapm,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
...@@ -92,7 +92,7 @@ static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card, ...@@ -92,7 +92,7 @@ static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card,
return 0; return 0;
} }
static int speyside_wm8962_hw_params(struct snd_pcm_substream *substream, static int tobermory_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
sample_rate = params_rate(params); sample_rate = params_rate(params);
...@@ -100,11 +100,11 @@ static int speyside_wm8962_hw_params(struct snd_pcm_substream *substream, ...@@ -100,11 +100,11 @@ static int speyside_wm8962_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static struct snd_soc_ops speyside_wm8962_ops = { static struct snd_soc_ops tobermory_ops = {
.hw_params = speyside_wm8962_hw_params, .hw_params = tobermory_hw_params,
}; };
static struct snd_soc_dai_link speyside_wm8962_dai[] = { static struct snd_soc_dai_link tobermory_dai[] = {
{ {
.name = "CPU", .name = "CPU",
.stream_name = "CPU", .stream_name = "CPU",
...@@ -114,7 +114,7 @@ static struct snd_soc_dai_link speyside_wm8962_dai[] = { ...@@ -114,7 +114,7 @@ static struct snd_soc_dai_link speyside_wm8962_dai[] = {
.codec_name = "wm8962.1-001a", .codec_name = "wm8962.1-001a",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM, | SND_SOC_DAIFMT_CBM_CFM,
.ops = &speyside_wm8962_ops, .ops = &tobermory_ops,
}, },
}; };
...@@ -152,10 +152,10 @@ static struct snd_soc_dapm_route audio_paths[] = { ...@@ -152,10 +152,10 @@ static struct snd_soc_dapm_route audio_paths[] = {
{ "DMICDAT", NULL, "DMIC" }, { "DMICDAT", NULL, "DMIC" },
}; };
static struct snd_soc_jack speyside_wm8962_headset; static struct snd_soc_jack tobermory_headset;
/* Headset jack detection DAPM pins */ /* Headset jack detection DAPM pins */
static struct snd_soc_jack_pin speyside_wm8962_headset_pins[] = { static struct snd_soc_jack_pin tobermory_headset_pins[] = {
{ {
.pin = "Headset Mic", .pin = "Headset Mic",
.mask = SND_JACK_MICROPHONE, .mask = SND_JACK_MICROPHONE,
...@@ -166,7 +166,7 @@ static struct snd_soc_jack_pin speyside_wm8962_headset_pins[] = { ...@@ -166,7 +166,7 @@ static struct snd_soc_jack_pin speyside_wm8962_headset_pins[] = {
}, },
}; };
static int speyside_wm8962_late_probe(struct snd_soc_card *card) static int tobermory_late_probe(struct snd_soc_card *card)
{ {
struct snd_soc_codec *codec = card->rtd[0].codec; struct snd_soc_codec *codec = card->rtd[0].codec;
struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai; struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
...@@ -179,28 +179,28 @@ static int speyside_wm8962_late_probe(struct snd_soc_card *card) ...@@ -179,28 +179,28 @@ static int speyside_wm8962_late_probe(struct snd_soc_card *card)
ret = snd_soc_jack_new(codec, "Headset", ret = snd_soc_jack_new(codec, "Headset",
SND_JACK_HEADSET | SND_JACK_BTN_0, SND_JACK_HEADSET | SND_JACK_BTN_0,
&speyside_wm8962_headset); &tobermory_headset);
if (ret) if (ret)
return ret; return ret;
ret = snd_soc_jack_add_pins(&speyside_wm8962_headset, ret = snd_soc_jack_add_pins(&tobermory_headset,
ARRAY_SIZE(speyside_wm8962_headset_pins), ARRAY_SIZE(tobermory_headset_pins),
speyside_wm8962_headset_pins); tobermory_headset_pins);
if (ret) if (ret)
return ret; return ret;
wm8962_mic_detect(codec, &speyside_wm8962_headset); wm8962_mic_detect(codec, &tobermory_headset);
return 0; return 0;
} }
static struct snd_soc_card speyside_wm8962 = { static struct snd_soc_card tobermory = {
.name = "Speyside WM8962", .name = "Tobermory",
.dai_link = speyside_wm8962_dai, .dai_link = tobermory_dai,
.num_links = ARRAY_SIZE(speyside_wm8962_dai), .num_links = ARRAY_SIZE(tobermory_dai),
.set_bias_level = speyside_wm8962_set_bias_level, .set_bias_level = tobermory_set_bias_level,
.set_bias_level_post = speyside_wm8962_set_bias_level_post, .set_bias_level_post = tobermory_set_bias_level_post,
.controls = controls, .controls = controls,
.num_controls = ARRAY_SIZE(controls), .num_controls = ARRAY_SIZE(controls),
...@@ -210,12 +210,12 @@ static struct snd_soc_card speyside_wm8962 = { ...@@ -210,12 +210,12 @@ static struct snd_soc_card speyside_wm8962 = {
.num_dapm_routes = ARRAY_SIZE(audio_paths), .num_dapm_routes = ARRAY_SIZE(audio_paths),
.fully_routed = true, .fully_routed = true,
.late_probe = speyside_wm8962_late_probe, .late_probe = tobermory_late_probe,
}; };
static __devinit int speyside_wm8962_probe(struct platform_device *pdev) static __devinit int tobermory_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &speyside_wm8962; struct snd_soc_card *card = &tobermory;
int ret; int ret;
card->dev = &pdev->dev; card->dev = &pdev->dev;
...@@ -230,7 +230,7 @@ static __devinit int speyside_wm8962_probe(struct platform_device *pdev) ...@@ -230,7 +230,7 @@ static __devinit int speyside_wm8962_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit speyside_wm8962_remove(struct platform_device *pdev) static int __devexit tobermory_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
...@@ -239,19 +239,19 @@ static int __devexit speyside_wm8962_remove(struct platform_device *pdev) ...@@ -239,19 +239,19 @@ static int __devexit speyside_wm8962_remove(struct platform_device *pdev)
return 0; return 0;
} }
static struct platform_driver speyside_wm8962_driver = { static struct platform_driver tobermory_driver = {
.driver = { .driver = {
.name = "speyside-wm8962", .name = "tobermory",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.probe = speyside_wm8962_probe, .probe = tobermory_probe,
.remove = __devexit_p(speyside_wm8962_remove), .remove = __devexit_p(tobermory_remove),
}; };
module_platform_driver(speyside_wm8962_driver); module_platform_driver(tobermory_driver);
MODULE_DESCRIPTION("Speyside WM8962 audio support"); MODULE_DESCRIPTION("Tobermory audio support");
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>"); MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:speyside-wm8962"); MODULE_ALIAS("platform:tobermory");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7