ASoC: Intel: byt-max98090: Add GPIO ACPI mapping table
Subsystems (3)
PATCH 1/1 ASoC: Intel: byt-max98090: Add GPIO ACPI mapping table
In order to make GPIO ACPI library stricter prepare users of gpiod_get_index() to correctly behave when there no mapping is provided by firmware.
Here we add explicit mapping between _CRS GpioIo() resources and their names used in the driver.
--- sound/soc/intel/boards/byt-max98090.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
sound/soc/intel/boards/byt-max98090.c +18 -4
@@ -67,20 +67,29 @@ static struct snd_soc_jack_pin hs_jack_pins[] = {static struct snd_soc_jack_gpio hs_jack_gpios[] = { { - .name ="hp-gpio" , + .name ="hp" , .idx =0 , .report =SND_JACK_HEADPHONE |SND_JACK_LINEOUT , .debounce_time =200 , }, { - .name ="mic-gpio" , - .idx =1 , + .name ="mic" , + .idx =0 , .invert =1 , .report =SND_JACK_MICROPHONE , .debounce_time =200 , }, }; +static const struct acpi_gpio_params hp_gpios = {0 ,0 , false }; +static const struct acpi_gpio_params mic_gpios = {1 ,0 , false }; + +static const struct acpi_gpio_mapping acpi_byt_max98090_gpios[] = { + {"hp-gpios" , &hp_gpios,1 }, + {"mic-gpios" , &mic_gpios,1 }, + {}, +}; +static int byt_max98090_init (struct snd_soc_pcm_runtime *runtime) {int ret;
@@ -140,8 +149,9 @@ static struct snd_soc_card byt_max98090_card = {static int byt_max98090_probe (struct platform_device *pdev) { -int ret_val =0 ; +struct device *dev = &pdev->dev;struct byt_max98090_private *priv; +int ret_val; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_ATOMIC );if (!priv) {
@@ -149,6 +159,10 @@ static int byt_max98090_probe(struct platform_device *pdev)return -ENOMEM ; } + ret_val =devm_acpi_dev_add_driver_gpios (dev, acpi_byt_max98090_gpios); +if (ret_val) +dev_dbg (dev,"Unable to add GPIO mapping table\n" ); + byt_max98090_card.dev = &pdev->dev;snd_soc_card_set_drvdata (&byt_max98090_card, priv); ret_val =devm_snd_soc_register_card (&pdev->dev, &byt_max98090_card);
Signature · 1 line
2.11.0
Quoted 8 lines · Andy Shevchenko
In order to make GPIO ACPI library stricter prepare users of
gpiod_get_index()to correctly behave when there no mapping is provided by firmware.Here we add explicit mapping between
_CRSGpioIo()resources and their names used in the driver.Signed-off-by Andy Shevchenko <[email protected]>
This is a bit more verbose than simply using the same connection name, but I guess will provide better diagnostic to userspace as we will have distinct GPIO names.
Quoted 64 lines
--- sound/soc/intel/boards/byt-max98090.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)sound/soc/intel/boards/byt-max98090.c +18
-5@@ -67,20 +67,29 @@ static struct snd_soc_jack_pin hs_jack_pins[] = {static struct snd_soc_jack_gpio hs_jack_gpios[] = { { - .name ="hp-gpio" , + .name ="hp" , .idx =0 , .report =SND_JACK_HEADPHONE |SND_JACK_LINEOUT , .debounce_time =200 , }, { - .name ="mic-gpio" , - .idx =1 , + .name ="mic" , + .idx =0 , .invert =1 , .report =SND_JACK_MICROPHONE , .debounce_time =200 , }, }; +static const struct acpi_gpio_params hp_gpios = {0 ,0 , false }; +static const struct acpi_gpio_params mic_gpios = {1 ,0 , false }; + +static const struct acpi_gpio_mapping acpi_byt_max98090_gpios[] = { + {"hp-gpios" , &hp_gpios,1 }, + {"mic-gpios" , &mic_gpios,1 }, + {}, +}; +static int byt_max98090_init (struct snd_soc_pcm_runtime *runtime) {int ret;@@ -140,8 +149,9 @@ static struct snd_soc_card byt_max98090_card = {static int byt_max98090_probe (struct platform_device *pdev) { -int ret_val =0 ; +struct device *dev = &pdev->dev;struct byt_max98090_private *priv; +int ret_val; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_ATOMIC );if (!priv) {@@ -149,6 +159,10 @@ static int byt_max98090_probe(struct platform_device *pdev)return -ENOMEM ; } + ret_val =devm_acpi_dev_add_driver_gpios (dev, acpi_byt_max98090_gpios); +if (ret_val) +dev_dbg (dev,"Unable to add GPIO mapping table\n" ); + byt_max98090_card.dev = &pdev->dev;snd_soc_card_set_drvdata (&byt_max98090_card, priv); ret_val =devm_snd_soc_register_card (&pdev->dev, &byt_max98090_card); --
Quoted 2 lines
2.11.0
Thanks.
Signature · 1 line
Dmitry
Quoted 9 lines · Dmitry Torokhov
Quoted 7 lines · Andy Shevchenko
In order to make GPIO ACPI library stricter prepare users of
gpiod_get_index()to correctly behave when there no mapping is provided by firmware.Here we add explicit mapping between
_CRSGpioIo()resources and their names used in the driver.
Quoted 7 lines
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>This is a bit more verbose than simply using the same connection name, but I guess will provide better diagnostic to userspace as we will have distinct GPIO names.
Reviewed-by Dmitry Torokhov <[email protected]>
Thanks!
But please test it.
See also below comment, just in case you have time to test that as well.
Quoted 28 lines
Quoted 27 lines
---
sound/soc/intel/boards/byt-max98090.c | 22 ++++++++++++++++++----1 file changed, 18 insertions(+), 4 deletions(-)sound/soc/intel/boards/byt-max98090.c +1
-1@@ -67,20 +67,29 @@ static struct snd_soc_jack_pin hs_jack_pins[] = { static struct snd_soc_jack_gpio hs_jack_gpios[] = { { - .name = "hp-gpio", + .name = "hp", .idx = 0,.report =
SND_JACK_HEADPHONE|SND_JACK_LINEOUT,
.debounce_time = 200,
},
{
- .name = "mic-gpio", - .idx = 1,
+ .name = "mic",
+ .idx = 0,
Quoted 1 line
Quoted 1 line
.invert = 1,
I dunno how this one is used inside ASoC core, but if we change it to 0 and...
Quoted 8 lines
sound/soc/intel/boards/byt-max98090.c static struct snd_soc_jack_pin hs_jack_pins[] = { · line 85
Quoted 8 lines
.report =
SND_JACK_MICROPHONE, .debounce_time = 200,
},
};sound/soc/intel/boards/byt-max98090.c +2
-0+static const struct acpi_gpio_params hp_gpios = {0 ,0 , false }; +static const struct acpi_gpio_params mic_gpios = {1 ,0 , false };
...change here to true, would it work?
Quoted 41 lines
Quoted 32 lines
sound/soc/intel/boards/byt-max98090.c +7
-0+ +static const struct acpi_gpio_mapping acpi_byt_max98090_gpios[] = { + { "hp-gpios", &hp_gpios, 1 }, + { "mic-gpios", &mic_gpios, 1 }, + {}, +}; +static int
byt_max98090_init(struct snd_soc_pcm_runtime *runtime){
int ret;sound/soc/intel/boards/byt-max98090.c +6
-1@@ -140,8 +149,9 @@ static struct snd_soc_card byt_max98090_card = { static int byt_max98090_probe(struct platform_device *pdev) { - int ret_val = 0; + struct device *dev = &pdev->dev; struct byt_max98090_private *priv; + int ret_val; priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_ATOMIC); if (!priv) {@@ -149,6 +159,10 @@ static int byt_max98090_probe(struct platform_device *pdev) return -ENOMEM; } + ret_val = devm_acpi_dev_add_driver_gpios(dev, acpi_byt_max98090_gpios); + if (ret_val) + dev_dbg(dev, "Unable to add GPIO mapping table\n"); + byt_max98090_card.dev = &pdev->dev;Quoted 6 lines
snd_soc_card_set_drvdata(&byt_max98090_card, priv);
ret_val=devm_snd_soc_register_card(&pdev->dev, &byt_max98090_card);
--
2.11.0Thanks.
Signature · 6 lines
Andy Shevchenko <[email protected]> Intel Finland Oy _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 17 lines · Andy Shevchenko
Quoted 16 lines · Dmitry Torokhov
Quoted 8 lines · Andy Shevchenko
In order to make GPIO ACPI library stricter prepare users of
gpiod_get_index()to correctly behave when there no mapping is provided by firmware.Here we add explicit mapping between
_CRSGpioIo()resources and their names used in the driver.Signed-off-by Andy Shevchenko <[email protected]>This is a bit more verbose than simply using the same connection name,
but I guess will provide better diagnostic to userspace as we will have distinct GPIO names.
Quoted 5 lines
Quoted 1 line
Reviewed-by Dmitry Torokhov <[email protected]>Thanks!
But please test it.
I have to check the device node I'm attaching the mapping table to.
On deeper glance it looks now wrong (attaching table to the card platform device when it should be codec's one?).
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy