mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 17:41:09 +00:00
7331ea474e
Commitf6b2a04590("ASoC: pxa: mioa701_wm9713: Convert to table based DAPM setup") converted the driver to register the board level DAPM elements with the card's DAPM context rather than the CODEC's DAPM context. The change overlooked that the speaker widget event callback accesses the widget's codec field which is only valid if the widget has been registered in a CODEC DAPM context. This patch modifies the callback to take an alternative route to get the CODEC. Fixes:f6b2a04590("ASoC: pxa: mioa701_wm9713: Convert to table based DAPM setup") Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
214 lines
6.3 KiB
C
214 lines
6.3 KiB
C
/*
|
|
* Handles the Mitac mioa701 SoC system
|
|
*
|
|
* Copyright (C) 2008 Robert Jarzmik
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation in version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* This is a little schema of the sound interconnections :
|
|
*
|
|
* Sagem X200 Wolfson WM9713
|
|
* +--------+ +-------------------+ Rear Speaker
|
|
* | | | | /-+
|
|
* | +--->----->---+MONOIN SPKL+--->----+-+ |
|
|
* | GSM | | | | | |
|
|
* | +--->----->---+PCBEEP SPKR+--->----+-+ |
|
|
* | CHIP | | | \-+
|
|
* | +---<-----<---+MONO |
|
|
* | | | | Front Speaker
|
|
* +--------+ | | /-+
|
|
* | HPL+--->----+-+ |
|
|
* | | | | |
|
|
* | OUT3+--->----+-+ |
|
|
* | | \-+
|
|
* | |
|
|
* | | Front Micro
|
|
* | | +
|
|
* | MIC1+-----<--+o+
|
|
* | | +
|
|
* +-------------------+ ---
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <mach/audio.h>
|
|
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/initval.h>
|
|
#include <sound/ac97_codec.h>
|
|
|
|
#include "pxa2xx-ac97.h"
|
|
#include "../codecs/wm9713.h"
|
|
|
|
#define AC97_GPIO_PULL 0x58
|
|
|
|
/* Use GPIO8 for rear speaker amplifier */
|
|
static int rear_amp_power(struct snd_soc_codec *codec, int power)
|
|
{
|
|
unsigned short reg;
|
|
|
|
if (power) {
|
|
reg = snd_soc_read(codec, AC97_GPIO_CFG);
|
|
snd_soc_write(codec, AC97_GPIO_CFG, reg | 0x0100);
|
|
reg = snd_soc_read(codec, AC97_GPIO_PULL);
|
|
snd_soc_write(codec, AC97_GPIO_PULL, reg | (1<<15));
|
|
} else {
|
|
reg = snd_soc_read(codec, AC97_GPIO_CFG);
|
|
snd_soc_write(codec, AC97_GPIO_CFG, reg & ~0x0100);
|
|
reg = snd_soc_read(codec, AC97_GPIO_PULL);
|
|
snd_soc_write(codec, AC97_GPIO_PULL, reg & ~(1<<15));
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int rear_amp_event(struct snd_soc_dapm_widget *widget,
|
|
struct snd_kcontrol *kctl, int event)
|
|
{
|
|
struct snd_soc_codec *codec = widget->dapm->card->rtd[0].codec;
|
|
|
|
return rear_amp_power(codec, SND_SOC_DAPM_EVENT_ON(event));
|
|
}
|
|
|
|
/* mioa701 machine dapm widgets */
|
|
static const struct snd_soc_dapm_widget mioa701_dapm_widgets[] = {
|
|
SND_SOC_DAPM_SPK("Front Speaker", NULL),
|
|
SND_SOC_DAPM_SPK("Rear Speaker", rear_amp_event),
|
|
SND_SOC_DAPM_MIC("Headset", NULL),
|
|
SND_SOC_DAPM_LINE("GSM Line Out", NULL),
|
|
SND_SOC_DAPM_LINE("GSM Line In", NULL),
|
|
SND_SOC_DAPM_MIC("Headset Mic", NULL),
|
|
SND_SOC_DAPM_MIC("Front Mic", NULL),
|
|
};
|
|
|
|
static const struct snd_soc_dapm_route audio_map[] = {
|
|
/* Call Mic */
|
|
{"Mic Bias", NULL, "Front Mic"},
|
|
{"MIC1", NULL, "Mic Bias"},
|
|
|
|
/* Headset Mic */
|
|
{"LINEL", NULL, "Headset Mic"},
|
|
{"LINER", NULL, "Headset Mic"},
|
|
|
|
/* GSM Module */
|
|
{"MONOIN", NULL, "GSM Line Out"},
|
|
{"PCBEEP", NULL, "GSM Line Out"},
|
|
{"GSM Line In", NULL, "MONO"},
|
|
|
|
/* headphone connected to HPL, HPR */
|
|
{"Headset", NULL, "HPL"},
|
|
{"Headset", NULL, "HPR"},
|
|
|
|
/* front speaker connected to HPL, OUT3 */
|
|
{"Front Speaker", NULL, "HPL"},
|
|
{"Front Speaker", NULL, "OUT3"},
|
|
|
|
/* rear speaker connected to SPKL, SPKR */
|
|
{"Rear Speaker", NULL, "SPKL"},
|
|
{"Rear Speaker", NULL, "SPKR"},
|
|
};
|
|
|
|
static int mioa701_wm9713_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
struct snd_soc_codec *codec = rtd->codec;
|
|
|
|
/* Prepare GPIO8 for rear speaker amplifier */
|
|
snd_soc_update_bits(codec, AC97_GPIO_CFG, 0x100, 0x100);
|
|
|
|
/* Prepare MIC input */
|
|
snd_soc_update_bits(codec, AC97_3D_CONTROL, 0xc000, 0xc000);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct snd_soc_ops mioa701_ops;
|
|
|
|
static struct snd_soc_dai_link mioa701_dai[] = {
|
|
{
|
|
.name = "AC97",
|
|
.stream_name = "AC97 HiFi",
|
|
.cpu_dai_name = "pxa2xx-ac97",
|
|
.codec_dai_name = "wm9713-hifi",
|
|
.codec_name = "wm9713-codec",
|
|
.init = mioa701_wm9713_init,
|
|
.platform_name = "pxa-pcm-audio",
|
|
.ops = &mioa701_ops,
|
|
},
|
|
{
|
|
.name = "AC97 Aux",
|
|
.stream_name = "AC97 Aux",
|
|
.cpu_dai_name = "pxa2xx-ac97-aux",
|
|
.codec_dai_name ="wm9713-aux",
|
|
.codec_name = "wm9713-codec",
|
|
.platform_name = "pxa-pcm-audio",
|
|
.ops = &mioa701_ops,
|
|
},
|
|
};
|
|
|
|
static struct snd_soc_card mioa701 = {
|
|
.name = "MioA701",
|
|
.owner = THIS_MODULE,
|
|
.dai_link = mioa701_dai,
|
|
.num_links = ARRAY_SIZE(mioa701_dai),
|
|
|
|
.dapm_widgets = mioa701_dapm_widgets,
|
|
.num_dapm_widgets = ARRAY_SIZE(mioa701_dapm_widgets),
|
|
.dapm_routes = audio_map,
|
|
.num_dapm_routes = ARRAY_SIZE(audio_map),
|
|
};
|
|
|
|
static int mioa701_wm9713_probe(struct platform_device *pdev)
|
|
{
|
|
int rc;
|
|
|
|
if (!machine_is_mioa701())
|
|
return -ENODEV;
|
|
|
|
mioa701.dev = &pdev->dev;
|
|
rc = snd_soc_register_card(&mioa701);
|
|
if (!rc)
|
|
dev_warn(&pdev->dev, "Be warned that incorrect mixers/muxes setup will"
|
|
"lead to overheating and possible destruction of your device."
|
|
" Do not use without a good knowledge of mio's board design!\n");
|
|
return rc;
|
|
}
|
|
|
|
static int mioa701_wm9713_remove(struct platform_device *pdev)
|
|
{
|
|
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
|
|
|
snd_soc_unregister_card(card);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver mioa701_wm9713_driver = {
|
|
.probe = mioa701_wm9713_probe,
|
|
.remove = mioa701_wm9713_remove,
|
|
.driver = {
|
|
.name = "mioa701-wm9713",
|
|
.pm = &snd_soc_pm_ops,
|
|
},
|
|
};
|
|
|
|
module_platform_driver(mioa701_wm9713_driver);
|
|
|
|
/* Module information */
|
|
MODULE_AUTHOR("Robert Jarzmik (rjarzmik@free.fr)");
|
|
MODULE_DESCRIPTION("ALSA SoC WM9713 MIO A701");
|
|
MODULE_LICENSE("GPL");
|