Skip to content

L
linux
Commit 0c5f4506 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next

parents 14345a58 3eb28d3c
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 20 deletions
sound/soc/codecs/ab8500-codec.c
View file @ 0c5f4506
...@@ -1496,6 +1496,12 @@ static const char * const enum_ad_to_slot_map[] = {"AD_OUT1", ...@@ -1496,6 +1496,12 @@ static const char * const enum_ad_to_slot_map[] = {"AD_OUT1",
"AD_OUT7", "AD_OUT7",
"AD_OUT8", "AD_OUT8",
"zeroes", "zeroes",
"zeroes",
"zeroes",
"zeroes",
"tristate",
"tristate",
"tristate",
"tristate"}; "tristate"};
static SOC_ENUM_SINGLE_DECL(soc_enum_adslot0map, static SOC_ENUM_SINGLE_DECL(soc_enum_adslot0map,
AB8500_ADSLOTSEL1, AB8500_ADSLOTSELX_EVEN_SHIFT, AB8500_ADSLOTSEL1, AB8500_ADSLOTSELX_EVEN_SHIFT,
......
sound/soc/codecs/sn95031.c
View file @ 0c5f4506
...@@ -883,7 +883,7 @@ static int sn95031_codec_remove(struct snd_soc_codec *codec) ...@@ -883,7 +883,7 @@ static int sn95031_codec_remove(struct snd_soc_codec *codec)
return 0; return 0;
} }
struct snd_soc_codec_driver sn95031_codec = { static struct snd_soc_codec_driver sn95031_codec = {
.probe = sn95031_codec_probe, .probe = sn95031_codec_probe,
.remove = sn95031_codec_remove, .remove = sn95031_codec_remove,
.read = sn95031_read, .read = sn95031_read,
......
sound/soc/ux500/mop500.c
View file @ 0c5f4506
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "mop500_ab8500.h" #include "mop500_ab8500.h"
/* Define the whole MOP500 soundcard, linking platform to the codec-drivers */ /* Define the whole MOP500 soundcard, linking platform to the codec-drivers */
struct snd_soc_dai_link mop500_dai_links[] = { static struct snd_soc_dai_link mop500_dai_links[] = {
{ {
.name = "ab8500_0", .name = "ab8500_0",
.stream_name = "ab8500_0", .stream_name = "ab8500_0",
......
sound/soc/ux500/mop500_ab8500.c
View file @ 0c5f4506
...@@ -125,9 +125,9 @@ static int mop500_ab8500_set_mclk(struct device *dev, ...@@ -125,9 +125,9 @@ static int mop500_ab8500_set_mclk(struct device *dev,
static int mclk_input_control_get(struct snd_kcontrol *kcontrol, static int mclk_input_control_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
struct mop500_ab8500_drvdata *drvdata = struct mop500_ab8500_drvdata *drvdata =
snd_soc_card_get_drvdata(codec->card); snd_soc_card_get_drvdata(card);
ucontrol->value.enumerated.item[0] = drvdata->mclk_sel; ucontrol->value.enumerated.item[0] = drvdata->mclk_sel;
...@@ -137,9 +137,9 @@ static int mclk_input_control_get(struct snd_kcontrol *kcontrol, ...@@ -137,9 +137,9 @@ static int mclk_input_control_get(struct snd_kcontrol *kcontrol,
static int mclk_input_control_put(struct snd_kcontrol *kcontrol, static int mclk_input_control_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
struct mop500_ab8500_drvdata *drvdata = struct mop500_ab8500_drvdata *drvdata =
snd_soc_card_get_drvdata(codec->card); snd_soc_card_get_drvdata(card);
unsigned int val = ucontrol->value.enumerated.item[0]; unsigned int val = ucontrol->value.enumerated.item[0];
if (val > (unsigned int)MCLK_ULPCLK) if (val > (unsigned int)MCLK_ULPCLK)
...@@ -160,16 +160,6 @@ static struct snd_kcontrol_new mop500_ab8500_ctrls[] = { ...@@ -160,16 +160,6 @@ static struct snd_kcontrol_new mop500_ab8500_ctrls[] = {
SOC_ENUM_EXT("Master Clock Select", SOC_ENUM_EXT("Master Clock Select",
soc_enum_mclk, soc_enum_mclk,
mclk_input_control_get, mclk_input_control_put), mclk_input_control_get, mclk_input_control_put),
/* Digital interface - Clocks */
SOC_SINGLE("Digital Interface Master Generator Switch",
AB8500_DIGIFCONF1, AB8500_DIGIFCONF1_ENMASTGEN,
1, 0),
SOC_SINGLE("Digital Interface 0 Bit-clock Switch",
AB8500_DIGIFCONF1, AB8500_DIGIFCONF1_ENFSBITCLK0,
1, 0),
SOC_SINGLE("Digital Interface 1 Bit-clock Switch",
AB8500_DIGIFCONF1, AB8500_DIGIFCONF1_ENFSBITCLK1,
1, 0),
SOC_DAPM_PIN_SWITCH("Headset Left"), SOC_DAPM_PIN_SWITCH("Headset Left"),
SOC_DAPM_PIN_SWITCH("Headset Right"), SOC_DAPM_PIN_SWITCH("Headset Right"),
SOC_DAPM_PIN_SWITCH("Earpiece"), SOC_DAPM_PIN_SWITCH("Earpiece"),
...@@ -193,7 +183,7 @@ static struct snd_kcontrol_new mop500_ab8500_ctrls[] = { ...@@ -193,7 +183,7 @@ static struct snd_kcontrol_new mop500_ab8500_ctrls[] = {
/* ASoC */ /* ASoC */
int mop500_ab8500_startup(struct snd_pcm_substream *substream) static int mop500_ab8500_startup(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
...@@ -202,7 +192,7 @@ int mop500_ab8500_startup(struct snd_pcm_substream *substream) ...@@ -202,7 +192,7 @@ int mop500_ab8500_startup(struct snd_pcm_substream *substream)
snd_soc_card_get_drvdata(rtd->card)); snd_soc_card_get_drvdata(rtd->card));
} }
void mop500_ab8500_shutdown(struct snd_pcm_substream *substream) static void mop500_ab8500_shutdown(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct device *dev = rtd->card->dev; struct device *dev = rtd->card->dev;
...@@ -216,7 +206,7 @@ void mop500_ab8500_shutdown(struct snd_pcm_substream *substream) ...@@ -216,7 +206,7 @@ void mop500_ab8500_shutdown(struct snd_pcm_substream *substream)
rx_slots = DEF_RX_SLOTS; rx_slots = DEF_RX_SLOTS;
} }
int mop500_ab8500_hw_params(struct snd_pcm_substream *substream, static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
...@@ -385,7 +375,7 @@ int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd) ...@@ -385,7 +375,7 @@ int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd)
drvdata->mclk_sel = MCLK_ULPCLK; drvdata->mclk_sel = MCLK_ULPCLK;
/* Add controls */ /* Add controls */
ret = snd_soc_add_codec_controls(codec, mop500_ab8500_ctrls, ret = snd_soc_add_card_controls(codec->card, mop500_ab8500_ctrls,
ARRAY_SIZE(mop500_ab8500_ctrls)); ARRAY_SIZE(mop500_ab8500_ctrls));
if (ret < 0) { if (ret < 0) {
pr_err("%s: Failed to add machine-controls (%d)!\n", pr_err("%s: Failed to add machine-controls (%d)!\n",
......
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