MLk-23585-2: ASoC: imx-wm8960: support multi instance
Move the golbal variables to structure, so all variables are private for each instance. replace the DRIVER_ATTR with DEVICE_ATTR to support multi instance. Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>5.4-rM2-2.2.x-imx-squashed
Shengjiu Wang
parent
72b1cc1310
commit
002cd44ea1
|
|
@ -27,6 +27,11 @@
|
|||
#include "fsl_sai.h"
|
||||
|
||||
struct imx_wm8960_data {
|
||||
enum of_gpio_flags hp_active_low;
|
||||
enum of_gpio_flags mic_active_low;
|
||||
bool is_headset_jack;
|
||||
struct platform_device *pdev;
|
||||
struct platform_device *asrc_pdev;
|
||||
struct snd_soc_card card;
|
||||
struct clk *codec_clk;
|
||||
unsigned int clk_frequency;
|
||||
|
|
@ -38,61 +43,33 @@ struct imx_wm8960_data {
|
|||
unsigned int hp_det[2];
|
||||
u32 asrc_rate;
|
||||
u32 asrc_format;
|
||||
};
|
||||
|
||||
struct imx_priv {
|
||||
enum of_gpio_flags hp_active_low;
|
||||
enum of_gpio_flags mic_active_low;
|
||||
bool is_headset_jack;
|
||||
struct platform_device *pdev;
|
||||
struct platform_device *asrc_pdev;
|
||||
};
|
||||
|
||||
static struct imx_priv card_priv;
|
||||
|
||||
static struct snd_soc_jack imx_hp_jack;
|
||||
static struct snd_soc_jack_pin imx_hp_jack_pin = {
|
||||
.pin = "Headphone Jack",
|
||||
.mask = SND_JACK_HEADPHONE,
|
||||
};
|
||||
static struct snd_soc_jack_gpio imx_hp_jack_gpio = {
|
||||
.name = "headphone detect",
|
||||
.report = SND_JACK_HEADPHONE,
|
||||
.debounce_time = 250,
|
||||
.invert = 0,
|
||||
};
|
||||
|
||||
static struct snd_soc_jack imx_mic_jack;
|
||||
static struct snd_soc_jack_pin imx_mic_jack_pins = {
|
||||
.pin = "Mic Jack",
|
||||
.mask = SND_JACK_MICROPHONE,
|
||||
};
|
||||
static struct snd_soc_jack_gpio imx_mic_jack_gpio = {
|
||||
.name = "mic detect",
|
||||
.report = SND_JACK_MICROPHONE,
|
||||
.debounce_time = 250,
|
||||
.invert = 0,
|
||||
struct snd_soc_jack imx_hp_jack;
|
||||
struct snd_soc_jack_pin imx_hp_jack_pin;
|
||||
struct snd_soc_jack_gpio imx_hp_jack_gpio;
|
||||
struct snd_soc_jack imx_mic_jack;
|
||||
struct snd_soc_jack_pin imx_mic_jack_pin;
|
||||
struct snd_soc_jack_gpio imx_mic_jack_gpio;
|
||||
};
|
||||
|
||||
static int hp_jack_status_check(void *data)
|
||||
{
|
||||
struct imx_priv *priv = &card_priv;
|
||||
struct snd_soc_jack *jack = data;
|
||||
struct imx_wm8960_data *imx_data = (struct imx_wm8960_data *)data;
|
||||
struct snd_soc_jack *jack = &imx_data->imx_hp_jack;
|
||||
struct snd_soc_dapm_context *dapm = &jack->card->dapm;
|
||||
int hp_status, ret;
|
||||
|
||||
hp_status = gpio_get_value_cansleep(imx_hp_jack_gpio.gpio);
|
||||
hp_status = gpio_get_value_cansleep(imx_data->imx_hp_jack_gpio.gpio);
|
||||
|
||||
if (hp_status != priv->hp_active_low) {
|
||||
if (hp_status != imx_data->hp_active_low) {
|
||||
snd_soc_dapm_disable_pin(dapm, "Ext Spk");
|
||||
if (priv->is_headset_jack) {
|
||||
if (imx_data->is_headset_jack) {
|
||||
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
|
||||
snd_soc_dapm_disable_pin(dapm, "Main MIC");
|
||||
}
|
||||
ret = imx_hp_jack_gpio.report;
|
||||
ret = imx_data->imx_hp_jack_gpio.report;
|
||||
} else {
|
||||
snd_soc_dapm_enable_pin(dapm, "Ext Spk");
|
||||
if (priv->is_headset_jack) {
|
||||
if (imx_data->is_headset_jack) {
|
||||
snd_soc_dapm_disable_pin(dapm, "Mic Jack");
|
||||
snd_soc_dapm_enable_pin(dapm, "Main MIC");
|
||||
}
|
||||
|
|
@ -104,16 +81,16 @@ static int hp_jack_status_check(void *data)
|
|||
|
||||
static int mic_jack_status_check(void *data)
|
||||
{
|
||||
struct imx_priv *priv = &card_priv;
|
||||
struct snd_soc_jack *jack = data;
|
||||
struct imx_wm8960_data *imx_data = (struct imx_wm8960_data *)data;
|
||||
struct snd_soc_jack *jack = &imx_data->imx_mic_jack;
|
||||
struct snd_soc_dapm_context *dapm = &jack->card->dapm;
|
||||
int mic_status, ret;
|
||||
|
||||
mic_status = gpio_get_value_cansleep(imx_mic_jack_gpio.gpio);
|
||||
mic_status = gpio_get_value_cansleep(imx_data->imx_mic_jack_gpio.gpio);
|
||||
|
||||
if (mic_status != priv->mic_active_low) {
|
||||
if (mic_status != imx_data->mic_active_low) {
|
||||
snd_soc_dapm_disable_pin(dapm, "Main MIC");
|
||||
ret = imx_mic_jack_gpio.report;
|
||||
ret = imx_data->imx_mic_jack_gpio.report;
|
||||
} else {
|
||||
snd_soc_dapm_enable_pin(dapm, "Main MIC");
|
||||
ret = 0;
|
||||
|
|
@ -147,15 +124,17 @@ static int imx_wm8960_jack_init(struct snd_soc_card *card,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t headphone_show(struct device_driver *dev, char *buf)
|
||||
static ssize_t headphone_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct imx_priv *priv = &card_priv;
|
||||
struct snd_soc_card *card = dev_get_drvdata(dev);
|
||||
struct imx_wm8960_data *data = snd_soc_card_get_drvdata(card);
|
||||
int hp_status;
|
||||
|
||||
/* Check if headphone is plugged in */
|
||||
hp_status = gpio_get_value_cansleep(imx_hp_jack_gpio.gpio);
|
||||
hp_status = gpio_get_value_cansleep(data->imx_hp_jack_gpio.gpio);
|
||||
|
||||
if (hp_status != priv->hp_active_low)
|
||||
if (hp_status != data->hp_active_low)
|
||||
strcpy(buf, "Headphone\n");
|
||||
else
|
||||
strcpy(buf, "Speaker\n");
|
||||
|
|
@ -163,23 +142,25 @@ static ssize_t headphone_show(struct device_driver *dev, char *buf)
|
|||
return strlen(buf);
|
||||
}
|
||||
|
||||
static ssize_t micphone_show(struct device_driver *dev, char *buf)
|
||||
static ssize_t micphone_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct imx_priv *priv = &card_priv;
|
||||
struct snd_soc_card *card = dev_get_drvdata(dev);
|
||||
struct imx_wm8960_data *data = snd_soc_card_get_drvdata(card);
|
||||
int mic_status;
|
||||
|
||||
/* Check if headphone is plugged in */
|
||||
mic_status = gpio_get_value_cansleep(imx_mic_jack_gpio.gpio);
|
||||
mic_status = gpio_get_value_cansleep(data->imx_mic_jack_gpio.gpio);
|
||||
|
||||
if (mic_status != priv->mic_active_low)
|
||||
if (mic_status != data->mic_active_low)
|
||||
strcpy(buf, "Mic Jack\n");
|
||||
else
|
||||
strcpy(buf, "Main MIC\n");
|
||||
|
||||
return strlen(buf);
|
||||
}
|
||||
static DRIVER_ATTR_RO(headphone);
|
||||
static DRIVER_ATTR_RO(micphone);
|
||||
static DEVICE_ATTR_RO(headphone);
|
||||
static DEVICE_ATTR_RO(micphone);
|
||||
|
||||
static int imx_hifi_hw_params(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_hw_params *params)
|
||||
|
|
@ -359,11 +340,10 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
|
|||
{
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct imx_wm8960_data *data = snd_soc_card_get_drvdata(card);
|
||||
struct imx_priv *priv = &card_priv;
|
||||
struct snd_interval *rate;
|
||||
struct snd_mask *mask;
|
||||
|
||||
if (!priv->asrc_pdev)
|
||||
if (!data->asrc_pdev)
|
||||
return -EINVAL;
|
||||
|
||||
rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
|
||||
|
|
@ -455,21 +435,35 @@ static int imx_wm8960_probe(struct platform_device *pdev)
|
|||
{
|
||||
struct device_node *cpu_np = NULL, *codec_np = NULL;
|
||||
struct platform_device *cpu_pdev;
|
||||
struct imx_priv *priv = &card_priv;
|
||||
struct imx_wm8960_data *data;
|
||||
struct platform_device *asrc_pdev = NULL;
|
||||
struct device_node *asrc_np;
|
||||
u32 width;
|
||||
int ret;
|
||||
|
||||
priv->pdev = pdev;
|
||||
|
||||
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
||||
if (!data) {
|
||||
ret = -ENOMEM;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
data->pdev = pdev;
|
||||
data->imx_hp_jack_pin.pin = "Headphone Jack";
|
||||
data->imx_hp_jack_pin.mask = SND_JACK_HEADPHONE;
|
||||
|
||||
data->imx_hp_jack_gpio.name = "headphone detect";
|
||||
data->imx_hp_jack_gpio.report = SND_JACK_HEADPHONE;
|
||||
data->imx_hp_jack_gpio.debounce_time = 250;
|
||||
data->imx_hp_jack_gpio.invert = 0;
|
||||
|
||||
data->imx_mic_jack_pin.pin = "Mic Jack";
|
||||
data->imx_mic_jack_pin.mask = SND_JACK_MICROPHONE;
|
||||
|
||||
data->imx_mic_jack_gpio.name = "mic detect";
|
||||
data->imx_mic_jack_gpio.report = SND_JACK_MICROPHONE;
|
||||
data->imx_mic_jack_gpio.debounce_time = 250;
|
||||
data->imx_mic_jack_gpio.invert = 0;
|
||||
|
||||
if (of_property_read_bool(pdev->dev.of_node, "codec-rpmsg"))
|
||||
data->is_codec_rpmsg = true;
|
||||
|
||||
|
|
@ -540,7 +534,7 @@ static int imx_wm8960_probe(struct platform_device *pdev)
|
|||
asrc_np = of_parse_phandle(pdev->dev.of_node, "asrc-controller", 0);
|
||||
if (asrc_np) {
|
||||
asrc_pdev = of_find_device_by_node(asrc_np);
|
||||
priv->asrc_pdev = asrc_pdev;
|
||||
data->asrc_pdev = asrc_pdev;
|
||||
}
|
||||
|
||||
data->card.dai_link = imx_wm8960_dai;
|
||||
|
|
@ -602,7 +596,6 @@ static int imx_wm8960_probe(struct platform_device *pdev)
|
|||
|
||||
data->card.late_probe = imx_wm8960_late_probe;
|
||||
|
||||
platform_set_drvdata(pdev, &data->card);
|
||||
snd_soc_card_set_drvdata(&data->card, data);
|
||||
ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
|
||||
if (ret) {
|
||||
|
|
@ -610,49 +603,52 @@ static int imx_wm8960_probe(struct platform_device *pdev)
|
|||
goto fail;
|
||||
}
|
||||
|
||||
imx_hp_jack_gpio.gpio = of_get_named_gpio_flags(pdev->dev.of_node,
|
||||
"hp-det-gpios", 0, &priv->hp_active_low);
|
||||
data->imx_hp_jack_gpio.gpio = of_get_named_gpio_flags(pdev->dev.of_node,
|
||||
"hp-det-gpios", 0,
|
||||
&data->hp_active_low);
|
||||
|
||||
imx_mic_jack_gpio.gpio = of_get_named_gpio_flags(pdev->dev.of_node,
|
||||
"mic-det-gpios", 0, &priv->mic_active_low);
|
||||
data->imx_mic_jack_gpio.gpio = of_get_named_gpio_flags(pdev->dev.of_node,
|
||||
"mic-det-gpios", 0,
|
||||
&data->mic_active_low);
|
||||
|
||||
if (gpio_is_valid(imx_hp_jack_gpio.gpio) &&
|
||||
gpio_is_valid(imx_mic_jack_gpio.gpio) &&
|
||||
imx_hp_jack_gpio.gpio == imx_mic_jack_gpio.gpio)
|
||||
priv->is_headset_jack = true;
|
||||
if (gpio_is_valid(data->imx_hp_jack_gpio.gpio) &&
|
||||
gpio_is_valid(data->imx_mic_jack_gpio.gpio) &&
|
||||
data->imx_hp_jack_gpio.gpio == data->imx_mic_jack_gpio.gpio)
|
||||
data->is_headset_jack = true;
|
||||
|
||||
if (gpio_is_valid(imx_hp_jack_gpio.gpio)) {
|
||||
if (priv->is_headset_jack) {
|
||||
imx_hp_jack_pin.mask |= SND_JACK_MICROPHONE;
|
||||
imx_hp_jack_gpio.report |= SND_JACK_MICROPHONE;
|
||||
if (gpio_is_valid(data->imx_hp_jack_gpio.gpio)) {
|
||||
if (data->is_headset_jack) {
|
||||
data->imx_hp_jack_pin.mask |= SND_JACK_MICROPHONE;
|
||||
data->imx_hp_jack_gpio.report |= SND_JACK_MICROPHONE;
|
||||
}
|
||||
|
||||
imx_hp_jack_gpio.jack_status_check = hp_jack_status_check;
|
||||
imx_hp_jack_gpio.data = &imx_hp_jack;
|
||||
ret = imx_wm8960_jack_init(&data->card, &imx_hp_jack,
|
||||
&imx_hp_jack_pin, &imx_hp_jack_gpio);
|
||||
data->imx_hp_jack_gpio.jack_status_check = hp_jack_status_check;
|
||||
data->imx_hp_jack_gpio.data = data;
|
||||
ret = imx_wm8960_jack_init(&data->card, &data->imx_hp_jack,
|
||||
&data->imx_hp_jack_pin, &data->imx_hp_jack_gpio);
|
||||
if (ret) {
|
||||
dev_warn(&pdev->dev, "hp jack init failed (%d)\n", ret);
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = driver_create_file(pdev->dev.driver, &driver_attr_headphone);
|
||||
ret = device_create_file(&pdev->dev, &dev_attr_headphone);
|
||||
if (ret)
|
||||
dev_warn(&pdev->dev, "create hp attr failed (%d)\n", ret);
|
||||
}
|
||||
|
||||
if (gpio_is_valid(imx_mic_jack_gpio.gpio)) {
|
||||
if (!priv->is_headset_jack) {
|
||||
imx_mic_jack_gpio.jack_status_check = mic_jack_status_check;
|
||||
imx_mic_jack_gpio.data = &imx_mic_jack;
|
||||
ret = imx_wm8960_jack_init(&data->card, &imx_mic_jack,
|
||||
&imx_mic_jack_pins, &imx_mic_jack_gpio);
|
||||
if (gpio_is_valid(data->imx_mic_jack_gpio.gpio)) {
|
||||
if (!data->is_headset_jack) {
|
||||
data->imx_mic_jack_gpio.jack_status_check = mic_jack_status_check;
|
||||
data->imx_mic_jack_gpio.data = data;
|
||||
ret = imx_wm8960_jack_init(&data->card, &data->imx_mic_jack,
|
||||
&data->imx_mic_jack_pin, &data->imx_mic_jack_gpio);
|
||||
if (ret) {
|
||||
dev_warn(&pdev->dev, "mic jack init failed (%d)\n", ret);
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
ret = driver_create_file(pdev->dev.driver, &driver_attr_micphone);
|
||||
|
||||
ret = device_create_file(&pdev->dev, &dev_attr_micphone);
|
||||
if (ret)
|
||||
dev_warn(&pdev->dev, "create mic attr failed (%d)\n", ret);
|
||||
}
|
||||
|
|
@ -670,8 +666,8 @@ fail:
|
|||
|
||||
static int imx_wm8960_remove(struct platform_device *pdev)
|
||||
{
|
||||
driver_remove_file(pdev->dev.driver, &driver_attr_micphone);
|
||||
driver_remove_file(pdev->dev.driver, &driver_attr_headphone);
|
||||
device_remove_file(&pdev->dev, &dev_attr_micphone);
|
||||
device_remove_file(&pdev->dev, &dev_attr_headphone);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue