Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-05 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: samsung: speyside: Convert to GPIO descriptor

Browse Source 
The Speyside ASoC uses a single GPIO from the WM8996
that we can provide from the local offset on that chip
rather than from the global GPIO numberspace as is being
done currently.

The offset 2 was done by calculating the base offset
for the CODEC (i.e. wm8996) GPIOs to 212, by reading
arch/arm/mach-s3c/gpio-samsung-s3c64xx.h and
arch/arm/mach-s3c/crag6410.h and adding up all the
offsets that were occasionally adding a +1 blank GPIO
between each GPIO provider.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patch.msgid.link/20250303-samsung-codecs-v1-4-56a2299dd928@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Linus Walleij 2025-03-03 09:41:44 +01:00 committed by Mark Brown
parent 5c06f7f3d8
commit da9146c19b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sound/soc/samsung/speyside.c
View File

@ -7,13 +7,13 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
#include <sound/jack.h> #include <sound/jack.h>
#include <linux/gpio.h> #include <linux/gpio/machine.h>
#include <linux/gpio/consumer.h>
#include <linux/module.h> #include <linux/module.h>
#include "../codecs/wm8996.h" #include "../codecs/wm8996.h"
#include "../codecs/wm9081.h" #include "../codecs/wm9081.h"
#define WM8996_HPSEL_GPIO 214
#define MCLK_AUDIO_RATE (512 * 48000) #define MCLK_AUDIO_RATE (512 * 48000)
static int speyside_set_bias_level(struct snd_soc_card *card, static int speyside_set_bias_level(struct snd_soc_card *card,
@ -105,6 +105,7 @@ static struct snd_soc_jack_pin speyside_headset_pins[] = {
}, },
}; };
static struct gpio_desc *speyside_hpsel_gpio;
/* Default the headphone selection to active high */ /* Default the headphone selection to active high */
static int speyside_jack_polarity; static int speyside_jack_polarity;
@ -123,7 +124,7 @@ static void speyside_set_polarity(struct snd_soc_component *component,
int polarity) int polarity)
{ {
speyside_jack_polarity = !polarity; speyside_jack_polarity = !polarity;
gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity); gpiod_direction_output(speyside_hpsel_gpio, speyside_jack_polarity);
/* Re-run DAPM to make sure we're using the correct mic bias */ /* Re-run DAPM to make sure we're using the correct mic bias */
snd_soc_dapm_sync(snd_soc_component_get_dapm(component)); snd_soc_dapm_sync(snd_soc_component_get_dapm(component));
@ -145,16 +146,22 @@ static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0);
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
enum gpiod_flags flags;
int ret; int ret;
ret = snd_soc_dai_set_sysclk(dai, WM8996_SYSCLK_MCLK2, 32768, 0); ret = snd_soc_dai_set_sysclk(dai, WM8996_SYSCLK_MCLK2, 32768, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = gpio_request(WM8996_HPSEL_GPIO, "HP_SEL"); if (speyside_jack_polarity)
if (ret != 0) flags = GPIOD_OUT_HIGH;
pr_err("Failed to request HP_SEL GPIO: %d\n", ret); else
gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity); flags = GPIOD_OUT_LOW;
speyside_hpsel_gpio = devm_gpiod_get(rtd->card->dev,
"hp-sel",
flags);
if (IS_ERR(speyside_hpsel_gpio))
return PTR_ERR(speyside_hpsel_gpio);
ret = snd_soc_card_jack_new_pins(rtd->card, "Headset", ret = snd_soc_card_jack_new_pins(rtd->card, "Headset",
SND_JACK_LINEOUT | SND_JACK_HEADSET | SND_JACK_LINEOUT | SND_JACK_HEADSET |
@ -325,6 +332,21 @@ static struct snd_soc_card speyside = {
.late_probe = speyside_late_probe, .late_probe = speyside_late_probe,
}; };
static struct gpiod_lookup_table wm8996_gpiod_table = {
/* Hardcoded device name in board file mach-crag6410.c */
.dev_id = "speyside",
.table = {
/*
* This line was hardcoded to 214 in the global GPIO
* number space, S3C GPIO macros seems top set the
* wm8996 codec GPIO start offset to 212, so this will
* be GPIO 214 - 212 = 2 on the wm8996.
*/
GPIO_LOOKUP("wm8996", 2, "hp-sel", GPIO_ACTIVE_HIGH),
{ },
},
};
static int speyside_probe(struct platform_device *pdev) static int speyside_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &speyside; struct snd_soc_card *card = &speyside;
@ -332,6 +354,7 @@ static int speyside_probe(struct platform_device *pdev)
card->dev = &pdev->dev; card->dev = &pdev->dev;
gpiod_add_lookup_table(&wm8996_gpiod_table);
ret = devm_snd_soc_register_card(&pdev->dev, card); ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret) if (ret)
dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n"); dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n");