Refactor Vangogh acp5x machine driver
Merge series from Lucas Tanure <lucas.tanure@collabora.com>: Provide small fixes and refactor the code for easier insertion of a new platform using the same acp5x machine driver.
This commit is contained in:
commit
4740479e2d
@ -6,37 +6,40 @@
|
||||
* Copyright 2021 Advanced Micro Devices, Inc.
|
||||
*/
|
||||
|
||||
#include <sound/soc.h>
|
||||
#include <sound/soc-dapm.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/io.h>
|
||||
#include <sound/pcm.h>
|
||||
#include <sound/pcm_params.h>
|
||||
|
||||
#include <sound/jack.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/dmi.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/input-event-codes.h>
|
||||
#include <linux/module.h>
|
||||
#include <sound/jack.h>
|
||||
#include <sound/pcm_params.h>
|
||||
#include <sound/soc.h>
|
||||
#include <sound/soc-dapm.h>
|
||||
|
||||
#include "../../codecs/nau8821.h"
|
||||
#include "../../codecs/cs35l41.h"
|
||||
|
||||
#include "acp5x.h"
|
||||
|
||||
#define DRV_NAME "acp5x_mach"
|
||||
#define DUAL_CHANNEL 2
|
||||
#define ACP5X_NUVOTON_CODEC_DAI "nau8821-hifi"
|
||||
#define VG_JUPITER 1
|
||||
#define ACP5X_NUVOTON_BCLK 3072000
|
||||
#define ACP5X_NAU8821_FREQ_OUT 12288000
|
||||
#define DRV_NAME "acp5x_mach"
|
||||
#define DUAL_CHANNEL 2
|
||||
#define VG_JUPITER 1
|
||||
#define ACP5X_NAU8821_BCLK 3072000
|
||||
#define ACP5X_NAU8821_FREQ_OUT 12288000
|
||||
#define ACP5X_NAU8821_COMP_NAME "i2c-NVTN2020:00"
|
||||
#define ACP5X_NAU8821_DAI_NAME "nau8821-hifi"
|
||||
#define ACP5X_CS35L41_COMP_LNAME "spi-VLV1776:00"
|
||||
#define ACP5X_CS35L41_COMP_RNAME "spi-VLV1776:01"
|
||||
#define ACP5X_CS35L41_DAI_NAME "cs35l41-pcm"
|
||||
|
||||
static unsigned long acp5x_machine_id;
|
||||
static struct snd_soc_jack vg_headset;
|
||||
|
||||
SND_SOC_DAILINK_DEF(platform, DAILINK_COMP_ARRAY(COMP_PLATFORM("acp5x_i2s_dma.0")));
|
||||
SND_SOC_DAILINK_DEF(acp5x_i2s, DAILINK_COMP_ARRAY(COMP_CPU("acp5x_i2s_playcap.0")));
|
||||
SND_SOC_DAILINK_DEF(acp5x_bt, DAILINK_COMP_ARRAY(COMP_CPU("acp5x_i2s_playcap.1")));
|
||||
SND_SOC_DAILINK_DEF(nau8821, DAILINK_COMP_ARRAY(COMP_CODEC(ACP5X_NAU8821_COMP_NAME,
|
||||
ACP5X_NAU8821_DAI_NAME)));
|
||||
|
||||
static struct snd_soc_jack_pin acp5x_nau8821_jack_pins[] = {
|
||||
{
|
||||
.pin = "Headphone",
|
||||
@ -48,18 +51,54 @@ static struct snd_soc_jack_pin acp5x_nau8821_jack_pins[] = {
|
||||
},
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new acp5x_8821_controls[] = {
|
||||
SOC_DAPM_PIN_SWITCH("Headphone"),
|
||||
SOC_DAPM_PIN_SWITCH("Headset Mic"),
|
||||
SOC_DAPM_PIN_SWITCH("Int Mic"),
|
||||
};
|
||||
|
||||
static int platform_clock_control(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *k, int event)
|
||||
{
|
||||
struct snd_soc_dapm_context *dapm = w->dapm;
|
||||
struct snd_soc_card *card = dapm->card;
|
||||
struct snd_soc_dai *dai;
|
||||
int ret = 0;
|
||||
|
||||
dai = snd_soc_card_get_codec_dai(card, ACP5X_NAU8821_DAI_NAME);
|
||||
if (!dai) {
|
||||
dev_err(card->dev, "Codec dai not found\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
if (SND_SOC_DAPM_EVENT_OFF(event)) {
|
||||
ret = snd_soc_dai_set_sysclk(dai, NAU8821_CLK_INTERNAL, 0, SND_SOC_CLOCK_IN);
|
||||
if (ret < 0) {
|
||||
dev_err(card->dev, "set sysclk err = %d\n", ret);
|
||||
return -EIO;
|
||||
}
|
||||
} else {
|
||||
ret = snd_soc_dai_set_sysclk(dai, NAU8821_CLK_FLL_BLK, 0, SND_SOC_CLOCK_IN);
|
||||
if (ret < 0)
|
||||
dev_err(dai->dev, "can't set BLK clock %d\n", ret);
|
||||
ret = snd_soc_dai_set_pll(dai, 0, 0, ACP5X_NAU8821_BCLK, ACP5X_NAU8821_FREQ_OUT);
|
||||
if (ret < 0)
|
||||
dev_err(dai->dev, "can't set FLL: %d\n", ret);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int acp5x_8821_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
|
||||
int ret;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct snd_soc_component *component =
|
||||
asoc_rtd_to_codec(rtd, 0)->component;
|
||||
|
||||
/*
|
||||
* Headset buttons map to the google Reference headset.
|
||||
* These can be configured by userspace.
|
||||
*/
|
||||
ret = snd_soc_card_jack_new_pins(card, "Headset Jack",
|
||||
ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",
|
||||
SND_JACK_HEADSET | SND_JACK_BTN_0,
|
||||
&vg_headset, acp5x_nau8821_jack_pins,
|
||||
ARRAY_SIZE(acp5x_nau8821_jack_pins));
|
||||
@ -70,12 +109,8 @@ static int acp5x_8821_init(struct snd_soc_pcm_runtime *rtd)
|
||||
|
||||
snd_jack_set_key(vg_headset.jack, SND_JACK_BTN_0, KEY_MEDIA);
|
||||
nau8821_enable_jack_detect(component, &vg_headset);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int acp5x_cs35l41_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const unsigned int rates[] = {
|
||||
@ -109,8 +144,7 @@ static int acp5x_8821_startup(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(card);
|
||||
struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(rtd->card);
|
||||
|
||||
machine->play_i2s_instance = I2S_SP_INSTANCE;
|
||||
machine->cap_i2s_instance = I2S_SP_INSTANCE;
|
||||
@ -123,6 +157,7 @@ static int acp5x_8821_startup(struct snd_pcm_substream *substream)
|
||||
snd_pcm_hw_constraint_list(substream->runtime, 0,
|
||||
SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
|
||||
&constraints_sample_bits);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -131,118 +166,112 @@ static int acp5x_nau8821_hw_params(struct snd_pcm_substream *substream,
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct snd_soc_dai *codec_dai =
|
||||
snd_soc_card_get_codec_dai(card,
|
||||
ACP5X_NUVOTON_CODEC_DAI);
|
||||
int ret;
|
||||
struct snd_soc_dai *dai = snd_soc_card_get_codec_dai(card, ACP5X_NAU8821_DAI_NAME);
|
||||
int ret, bclk;
|
||||
|
||||
ret = snd_soc_dai_set_sysclk(codec_dai, NAU8821_CLK_FLL_BLK, 0,
|
||||
SND_SOC_CLOCK_IN);
|
||||
ret = snd_soc_dai_set_sysclk(dai, NAU8821_CLK_FLL_BLK, 0, SND_SOC_CLOCK_IN);
|
||||
if (ret < 0)
|
||||
dev_err(card->dev, "can't set FS clock %d\n", ret);
|
||||
ret = snd_soc_dai_set_pll(codec_dai, 0, 0, snd_soc_params_to_bclk(params),
|
||||
params_rate(params) * 256);
|
||||
|
||||
bclk = snd_soc_params_to_bclk(params);
|
||||
if (bclk < 0) {
|
||||
dev_err(dai->dev, "Fail to get BCLK rate: %d\n", bclk);
|
||||
return bclk;
|
||||
}
|
||||
|
||||
ret = snd_soc_dai_set_pll(dai, 0, 0, bclk, params_rate(params) * 256);
|
||||
if (ret < 0)
|
||||
dev_err(card->dev, "can't set FLL: %d\n", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int acp5x_cs35l41_startup(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(card);
|
||||
|
||||
machine->play_i2s_instance = I2S_HS_INSTANCE;
|
||||
|
||||
runtime->hw.channels_max = DUAL_CHANNEL;
|
||||
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
|
||||
&constraints_channels);
|
||||
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
|
||||
&constraints_rates);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_hw_params *params)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct snd_soc_dai *codec_dai;
|
||||
int ret, i;
|
||||
unsigned int num_codecs = rtd->dai_link->num_codecs;
|
||||
unsigned int bclk_val;
|
||||
|
||||
ret = 0;
|
||||
for (i = 0; i < num_codecs; i++) {
|
||||
codec_dai = asoc_rtd_to_codec(rtd, i);
|
||||
if (strcmp(codec_dai->name, "cs35l41-pcm") == 0) {
|
||||
switch (params_rate(params)) {
|
||||
case 48000:
|
||||
bclk_val = 1536000;
|
||||
break;
|
||||
default:
|
||||
dev_err(card->dev, "Invalid Samplerate:0x%x\n",
|
||||
params_rate(params));
|
||||
return -EINVAL;
|
||||
}
|
||||
ret = snd_soc_component_set_sysclk(codec_dai->component,
|
||||
0, 0, bclk_val, SND_SOC_CLOCK_IN);
|
||||
if (ret < 0) {
|
||||
dev_err(card->dev, "failed to set sysclk for CS35l41 dai\n");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const struct snd_soc_ops acp5x_8821_ops = {
|
||||
.startup = acp5x_8821_startup,
|
||||
.hw_params = acp5x_nau8821_hw_params,
|
||||
};
|
||||
|
||||
static int acp5x_cs35l41_startup(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
||||
struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(rtd->card);
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
|
||||
machine->play_i2s_instance = I2S_HS_INSTANCE;
|
||||
|
||||
runtime->hw.channels_max = DUAL_CHANNEL;
|
||||
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
|
||||
&constraints_channels);
|
||||
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
|
||||
&constraints_rates);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_hw_params *params)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
||||
unsigned int bclk, rate = params_rate(params);
|
||||
struct snd_soc_component *comp;
|
||||
int ret, i;
|
||||
|
||||
switch (rate) {
|
||||
case 48000:
|
||||
bclk = 1536000;
|
||||
break;
|
||||
default:
|
||||
bclk = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
for_each_rtd_components(rtd, i, comp) {
|
||||
if (!(strcmp(comp->name, ACP5X_CS35L41_COMP_LNAME)) ||
|
||||
!(strcmp(comp->name, ACP5X_CS35L41_COMP_RNAME))) {
|
||||
if (!bclk) {
|
||||
dev_err(comp->dev, "Invalid sample rate: 0x%x\n", rate);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = snd_soc_component_set_sysclk(comp, 0, 0, bclk, SND_SOC_CLOCK_IN);
|
||||
if (ret) {
|
||||
dev_err(comp->dev, "failed to set SYSCLK: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
static const struct snd_soc_ops acp5x_cs35l41_play_ops = {
|
||||
.startup = acp5x_cs35l41_startup,
|
||||
.hw_params = acp5x_cs35l41_hw_params,
|
||||
};
|
||||
|
||||
static struct snd_soc_codec_conf cs35l41_conf[] = {
|
||||
static struct snd_soc_codec_conf acp5x_cs35l41_conf[] = {
|
||||
{
|
||||
.dlc = COMP_CODEC_CONF("spi-VLV1776:00"),
|
||||
.dlc = COMP_CODEC_CONF(ACP5X_CS35L41_COMP_LNAME),
|
||||
.name_prefix = "Left",
|
||||
},
|
||||
{
|
||||
.dlc = COMP_CODEC_CONF("spi-VLV1776:01"),
|
||||
.dlc = COMP_CODEC_CONF(ACP5X_CS35L41_COMP_RNAME),
|
||||
.name_prefix = "Right",
|
||||
},
|
||||
};
|
||||
|
||||
SND_SOC_DAILINK_DEF(acp5x_i2s,
|
||||
DAILINK_COMP_ARRAY(COMP_CPU("acp5x_i2s_playcap.0")));
|
||||
SND_SOC_DAILINK_DEF(cs35l41, DAILINK_COMP_ARRAY(COMP_CODEC(ACP5X_CS35L41_COMP_LNAME,
|
||||
ACP5X_CS35L41_DAI_NAME),
|
||||
COMP_CODEC(ACP5X_CS35L41_COMP_RNAME,
|
||||
ACP5X_CS35L41_DAI_NAME)));
|
||||
|
||||
SND_SOC_DAILINK_DEF(acp5x_bt,
|
||||
DAILINK_COMP_ARRAY(COMP_CPU("acp5x_i2s_playcap.1")));
|
||||
|
||||
SND_SOC_DAILINK_DEF(nau8821,
|
||||
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-NVTN2020:00",
|
||||
"nau8821-hifi")));
|
||||
|
||||
SND_SOC_DAILINK_DEF(cs35l41,
|
||||
DAILINK_COMP_ARRAY(COMP_CODEC("spi-VLV1776:00", "cs35l41-pcm"),
|
||||
COMP_CODEC("spi-VLV1776:01", "cs35l41-pcm")));
|
||||
|
||||
SND_SOC_DAILINK_DEF(platform,
|
||||
DAILINK_COMP_ARRAY(COMP_PLATFORM("acp5x_i2s_dma.0")));
|
||||
|
||||
static struct snd_soc_dai_link acp5x_dai[] = {
|
||||
static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = {
|
||||
{
|
||||
.name = "acp5x-8821-play",
|
||||
.stream_name = "Playback/Capture",
|
||||
.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_CBC_CFC,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
@ -253,65 +282,28 @@ static struct snd_soc_dai_link acp5x_dai[] = {
|
||||
{
|
||||
.name = "acp5x-CS35L41-Stereo",
|
||||
.stream_name = "CS35L41 Stereo Playback",
|
||||
.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_CBC_CFC,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &acp5x_cs35l41_play_ops,
|
||||
.init = acp5x_cs35l41_init,
|
||||
SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform),
|
||||
},
|
||||
};
|
||||
|
||||
static int platform_clock_control(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *k, int event)
|
||||
{
|
||||
struct snd_soc_dapm_context *dapm = w->dapm;
|
||||
struct snd_soc_card *card = dapm->card;
|
||||
struct snd_soc_dai *codec_dai;
|
||||
int ret = 0;
|
||||
|
||||
codec_dai = snd_soc_card_get_codec_dai(card, ACP5X_NUVOTON_CODEC_DAI);
|
||||
if (!codec_dai) {
|
||||
dev_err(card->dev, "Codec dai not found\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
if (SND_SOC_DAPM_EVENT_OFF(event)) {
|
||||
ret = snd_soc_dai_set_sysclk(codec_dai, NAU8821_CLK_INTERNAL,
|
||||
0, SND_SOC_CLOCK_IN);
|
||||
if (ret < 0) {
|
||||
dev_err(card->dev, "set sysclk err = %d\n", ret);
|
||||
return -EIO;
|
||||
}
|
||||
} else {
|
||||
ret = snd_soc_dai_set_sysclk(codec_dai, NAU8821_CLK_FLL_BLK, 0,
|
||||
SND_SOC_CLOCK_IN);
|
||||
if (ret < 0)
|
||||
dev_err(codec_dai->dev, "can't set BLK clock %d\n", ret);
|
||||
ret = snd_soc_dai_set_pll(codec_dai, 0, 0, ACP5X_NUVOTON_BCLK,
|
||||
ACP5X_NAU8821_FREQ_OUT);
|
||||
if (ret < 0)
|
||||
dev_err(codec_dai->dev, "can't set FLL: %d\n", ret);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const struct snd_kcontrol_new acp5x_8821_controls[] = {
|
||||
SOC_DAPM_PIN_SWITCH("Headphone"),
|
||||
SOC_DAPM_PIN_SWITCH("Headset Mic"),
|
||||
SOC_DAPM_PIN_SWITCH("Int Mic"),
|
||||
};
|
||||
|
||||
static const struct snd_soc_dapm_widget acp5x_8821_widgets[] = {
|
||||
static const struct snd_soc_dapm_widget acp5x_8821_35l41_widgets[] = {
|
||||
SND_SOC_DAPM_HP("Headphone", NULL),
|
||||
SND_SOC_DAPM_MIC("Headset Mic", NULL),
|
||||
SND_SOC_DAPM_MIC("Int Mic", NULL),
|
||||
SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
|
||||
platform_clock_control, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
|
||||
platform_clock_control,
|
||||
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
|
||||
};
|
||||
|
||||
static const struct snd_soc_dapm_route acp5x_8821_audio_route[] = {
|
||||
static const struct snd_soc_dapm_route acp5x_8821_35l41_audio_route[] = {
|
||||
/* HP jack connectors - unknown if we have jack detection */
|
||||
{ "Headphone", NULL, "HPOL" },
|
||||
{ "Headphone", NULL, "HPOR" },
|
||||
@ -324,17 +316,17 @@ static const struct snd_soc_dapm_route acp5x_8821_audio_route[] = {
|
||||
{ "Int Mic", NULL, "Platform Clock" },
|
||||
};
|
||||
|
||||
static struct snd_soc_card acp5x_card = {
|
||||
static struct snd_soc_card acp5x_8821_35l41_card = {
|
||||
.name = "acp5x",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = acp5x_dai,
|
||||
.num_links = ARRAY_SIZE(acp5x_dai),
|
||||
.dapm_widgets = acp5x_8821_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(acp5x_8821_widgets),
|
||||
.dapm_routes = acp5x_8821_audio_route,
|
||||
.num_dapm_routes = ARRAY_SIZE(acp5x_8821_audio_route),
|
||||
.codec_conf = cs35l41_conf,
|
||||
.num_configs = ARRAY_SIZE(cs35l41_conf),
|
||||
.dai_link = acp5x_8821_35l41_dai,
|
||||
.num_links = ARRAY_SIZE(acp5x_8821_35l41_dai),
|
||||
.dapm_widgets = acp5x_8821_35l41_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(acp5x_8821_35l41_widgets),
|
||||
.dapm_routes = acp5x_8821_35l41_audio_route,
|
||||
.num_dapm_routes = ARRAY_SIZE(acp5x_8821_35l41_audio_route),
|
||||
.codec_conf = acp5x_cs35l41_conf,
|
||||
.num_configs = ARRAY_SIZE(acp5x_cs35l41_conf),
|
||||
.controls = acp5x_8821_controls,
|
||||
.num_controls = ARRAY_SIZE(acp5x_8821_controls),
|
||||
};
|
||||
@ -342,6 +334,7 @@ static struct snd_soc_card acp5x_card = {
|
||||
static int acp5x_vg_quirk_cb(const struct dmi_system_id *id)
|
||||
{
|
||||
acp5x_machine_id = VG_JUPITER;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -358,33 +351,31 @@ static const struct dmi_system_id acp5x_vg_quirk_table[] = {
|
||||
|
||||
static int acp5x_probe(struct platform_device *pdev)
|
||||
{
|
||||
int ret;
|
||||
struct acp5x_platform_info *machine;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct snd_soc_card *card;
|
||||
int ret;
|
||||
|
||||
machine = devm_kzalloc(&pdev->dev, sizeof(struct acp5x_platform_info),
|
||||
GFP_KERNEL);
|
||||
machine = devm_kzalloc(dev, sizeof(*machine), GFP_KERNEL);
|
||||
if (!machine)
|
||||
return -ENOMEM;
|
||||
|
||||
dmi_check_system(acp5x_vg_quirk_table);
|
||||
switch (acp5x_machine_id) {
|
||||
case VG_JUPITER:
|
||||
card = &acp5x_card;
|
||||
acp5x_card.dev = &pdev->dev;
|
||||
card = &acp5x_8821_35l41_card;
|
||||
break;
|
||||
default:
|
||||
return -ENODEV;
|
||||
}
|
||||
card->dev = dev;
|
||||
platform_set_drvdata(pdev, card);
|
||||
snd_soc_card_set_drvdata(card, machine);
|
||||
|
||||
ret = devm_snd_soc_register_card(&pdev->dev, card);
|
||||
if (ret) {
|
||||
return dev_err_probe(&pdev->dev, ret,
|
||||
"snd_soc_register_card(%s) failed\n",
|
||||
acp5x_card.name);
|
||||
}
|
||||
ret = devm_snd_soc_register_card(dev, card);
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret, "Register card (%s) failed\n", card->name);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user