ASoC: rt5677: Move platform code to where it belongs
Subsystems (4)
v2 cover ASoC: rt5677: Move platform code to where it belongs
There are few issues with current approach:
- ACPI enumeration should be done by IDs, and not by instances
- Platform code with board related stuff should reside in corresponding module
Fix those issues here.
Andy Shevchenko (3):
ASoC: rt5677: Introduce proper table for ACPI enumeration
ASoC: rt5677: Move platform code to board file
ASoC: Intel: bdw-rt5677: Switch to devm_acpi_dev_add_driver_gpios()
sound/soc/codecs/rt5677.c | 32 +++++++------------------------- sound/soc/intel/boards/bdw-rt5677.c | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 25 deletions(-)
Signature · 1 line
2.11.0
PATCH v2 1/3 ASoC: rt5677: Introduce proper table for ACPI enumeration
I2C devices are enumerated by IDs, and not by instances. Make it clear by using proper module device table for ACPI case.
--- sound/soc/codecs/rt5677.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
sound/soc/codecs/rt5677.c +9 -1
@@ -5030,7 +5030,6 @@ static const struct regmap_config rt5677_regmap = {static const struct i2c_device_id rt5677_i2c_id[] = { {"rt5677" ,RT5677 }, {"rt5676" ,RT5676 }, - {"RT5677CE:00" ,RT5677 }, { } };MODULE_DEVICE_TABLE (i2c, rt5677_i2c_id);
@@ -5041,6 +5040,14 @@ static const struct of_device_id rt5677_of_match[] = { };MODULE_DEVICE_TABLE (of, rt5677_of_match); +#ifdef CONFIG_ACPI +static const struct acpi_device_id rt5677_acpi_match[] = { + {"RT5677CE" ,RT5677 }, + { } +}; +MODULE_DEVICE_TABLE (acpi, rt5677_acpi_match); +#endif +static const struct acpi_gpio_params plug_det_gpio = {RT5677_GPIO_PLUG_DET ,0 , false };static const struct acpi_gpio_params mic_present_gpio = {RT5677_GPIO_MIC_PRESENT_L ,0 , false };static const struct acpi_gpio_params headphone_enable_gpio = {RT5677_GPIO_HP_AMP_SHDN_L ,0 , false };
@@ -5301,6 +5308,7 @@ static struct i2c_driver rt5677_i2c_driver = { .driver = { .name = "rt5677", .of_match_table = rt5677_of_match, + .acpi_match_table = ACPI_PTR(rt5677_acpi_match), }, .probe = rt5677_i2c_probe, .remove = rt5677_i2c_remove,
Signature · 1 line
2.11.0
PATCH v2 2/3 ASoC: rt5677: Move platform code to board file
In reply to Andy ShevchenkoGPIO ACPI mapping table is defined on platform basis. Codec driver shouldn't have known what platform is using it.
Make codec driver more generic by moving platform code to where it belongs.
--- sound/soc/codecs/rt5677.c | 26 -------------------------- sound/soc/intel/boards/bdw-rt5677.c | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-)
sound/soc/codecs/rt5677.c +0 -26
@@ -41,15 +41,6 @@#define RT5677_PR_BASE (RT5677_PR_RANGE_BASE + (0 * RT5677_PR_SPACING)) -/* GPIO indexes defined by ACPI */ -enum { -RT5677_GPIO_PLUG_DET =0 , -RT5677_GPIO_MIC_PRESENT_L =1 , -RT5677_GPIO_HOTWORD_DET_L =2 , -RT5677_GPIO_DSP_INT =3 , -RT5677_GPIO_HP_AMP_SHDN_L =4 , -}; -static const struct regmap_range_cfg rt5677_ranges[] = { { .name ="PR" ,
@@ -5048,28 +5039,11 @@ static const struct acpi_device_id rt5677_acpi_match[] = {MODULE_DEVICE_TABLE (acpi, rt5677_acpi_match);#endif -static const struct acpi_gpio_params plug_det_gpio = {RT5677_GPIO_PLUG_DET ,0 , false }; -static const struct acpi_gpio_params mic_present_gpio = {RT5677_GPIO_MIC_PRESENT_L ,0 , false }; -static const struct acpi_gpio_params headphone_enable_gpio = {RT5677_GPIO_HP_AMP_SHDN_L ,0 , false }; - -static const struct acpi_gpio_mapping bdw_rt5677_gpios[] = { - {"plug-det-gpios" , &plug_det_gpio,1 }, - {"mic-present-gpios" , &mic_present_gpio,1 }, - {"headphone-enable-gpios" , &headphone_enable_gpio,1 }, - {NULL }, -}; -static void rt5677_read_acpi_properties (struct rt5677_priv *rt5677,struct device *dev) { -int ret;u32 val; - ret =acpi_dev_add_driver_gpios (ACPI_COMPANION (dev), - bdw_rt5677_gpios); -if (ret) -dev_warn (dev,"Failed to add driver gpios\n" ); -if (!device_property_read_u32 (dev,"DCLK" , &val)) rt5677->pdata.dmic2_clk_pin = val;
sound/soc/intel/boards/bdw-rt5677.c +27 -0
@@ -16,6 +16,7 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/gpio/consumer.h>
@@ -120,6 +121,26 @@ static struct snd_soc_jack_gpio mic_jack_gpio = { .invert = 1, }; +/* GPIO indexes defined by ACPI */ +enum { +RT5677_GPIO_PLUG_DET =0 , +RT5677_GPIO_MIC_PRESENT_L =1 , +RT5677_GPIO_HOTWORD_DET_L =2 , +RT5677_GPIO_DSP_INT =3 , +RT5677_GPIO_HP_AMP_SHDN_L =4 , +}; + +static const struct acpi_gpio_params plug_det_gpio = {RT5677_GPIO_PLUG_DET ,0 , false }; +static const struct acpi_gpio_params mic_present_gpio = {RT5677_GPIO_MIC_PRESENT_L ,0 , false }; +static const struct acpi_gpio_params headphone_enable_gpio = {RT5677_GPIO_HP_AMP_SHDN_L ,0 , false }; + +static const struct acpi_gpio_mapping bdw_rt5677_gpios[] = { + {"plug-det-gpios" , &plug_det_gpio,1 }, + {"mic-present-gpios" , &mic_present_gpio,1 }, + {"headphone-enable-gpios" , &headphone_enable_gpio,1 }, + {NULL }, +}; +static int broadwell_ssp0_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params) {
@@ -184,6 +205,12 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)snd_soc_card_get_drvdata (rtd->card);struct snd_soc_codec *codec = rtd->codec;struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec); +int ret; + + ret =acpi_dev_add_driver_gpios (ACPI_COMPANION (codec->dev), + bdw_rt5677_gpios); +if (ret) +dev_warn (codec->dev,"Failed to add driver gpios\n" );/* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1. * The ASRC clock source is clk_i2s1_asrc.
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: rt5677: Move platform code to board file" to the asoc tree
The patch
ASoC: rt5677: Move platform code to board file
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
55e59aa0525a461abcbc226ace7a7eb9d9a07a4aMon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Thu, 15 Jun 2017 15:46:37 +0300
Subject: [PATCH] ASoC: rt5677: Move platform code to board file
GPIO ACPI mapping table is defined on platform basis. Codec driver shouldn't have known what platform is using it.
Make codec driver more generic by moving platform code to where it belongs.
--- sound/soc/codecs/rt5677.c | 26 -------------------------- sound/soc/intel/boards/bdw-rt5677.c | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-)
sound/soc/codecs/rt5677.c +0 -26
@@ -41,15 +41,6 @@#define RT5677_PR_BASE (RT5677_PR_RANGE_BASE + (0 * RT5677_PR_SPACING)) -/* GPIO indexes defined by ACPI */ -enum { -RT5677_GPIO_PLUG_DET =0 , -RT5677_GPIO_MIC_PRESENT_L =1 , -RT5677_GPIO_HOTWORD_DET_L =2 , -RT5677_GPIO_DSP_INT =3 , -RT5677_GPIO_HP_AMP_SHDN_L =4 , -}; -static const struct regmap_range_cfg rt5677_ranges[] = { { .name ="PR" ,
@@ -5048,28 +5039,11 @@ static const struct acpi_device_id rt5677_acpi_match[] = {MODULE_DEVICE_TABLE (acpi, rt5677_acpi_match);#endif -static const struct acpi_gpio_params plug_det_gpio = {RT5677_GPIO_PLUG_DET ,0 , false }; -static const struct acpi_gpio_params mic_present_gpio = {RT5677_GPIO_MIC_PRESENT_L ,0 , false }; -static const struct acpi_gpio_params headphone_enable_gpio = {RT5677_GPIO_HP_AMP_SHDN_L ,0 , false }; - -static const struct acpi_gpio_mapping bdw_rt5677_gpios[] = { - {"plug-det-gpios" , &plug_det_gpio,1 }, - {"mic-present-gpios" , &mic_present_gpio,1 }, - {"headphone-enable-gpios" , &headphone_enable_gpio,1 }, - {NULL }, -}; -static void rt5677_read_acpi_properties (struct rt5677_priv *rt5677,struct device *dev) { -int ret;u32 val; - ret =acpi_dev_add_driver_gpios (ACPI_COMPANION (dev), - bdw_rt5677_gpios); -if (ret) -dev_warn (dev,"Failed to add driver gpios\n" ); -if (!device_property_read_u32 (dev,"DCLK" , &val)) rt5677->pdata.dmic2_clk_pin = val;
sound/soc/intel/boards/bdw-rt5677.c +27 -0
@@ -16,6 +16,7 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/gpio/consumer.h>
@@ -120,6 +121,26 @@ static struct snd_soc_jack_gpio mic_jack_gpio = { .invert = 1, }; +/* GPIO indexes defined by ACPI */ +enum { +RT5677_GPIO_PLUG_DET =0 , +RT5677_GPIO_MIC_PRESENT_L =1 , +RT5677_GPIO_HOTWORD_DET_L =2 , +RT5677_GPIO_DSP_INT =3 , +RT5677_GPIO_HP_AMP_SHDN_L =4 , +}; + +static const struct acpi_gpio_params plug_det_gpio = {RT5677_GPIO_PLUG_DET ,0 , false }; +static const struct acpi_gpio_params mic_present_gpio = {RT5677_GPIO_MIC_PRESENT_L ,0 , false }; +static const struct acpi_gpio_params headphone_enable_gpio = {RT5677_GPIO_HP_AMP_SHDN_L ,0 , false }; + +static const struct acpi_gpio_mapping bdw_rt5677_gpios[] = { + {"plug-det-gpios" , &plug_det_gpio,1 }, + {"mic-present-gpios" , &mic_present_gpio,1 }, + {"headphone-enable-gpios" , &headphone_enable_gpio,1 }, + {NULL }, +}; +static int broadwell_ssp0_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params) {
@@ -184,6 +205,12 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)snd_soc_card_get_drvdata (rtd->card);struct snd_soc_codec *codec = rtd->codec;struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec); +int ret; + + ret =acpi_dev_add_driver_gpios (ACPI_COMPANION (codec->dev), + bdw_rt5677_gpios); +if (ret) +dev_warn (codec->dev,"Failed to add driver gpios\n" );/* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1. * The ASRC clock source is clk_i2s1_asrc.
Signature · 1 line
2.11.0
PATCH v2 3/3 ASoC: Intel: bdw-rt5677: Switch to devm_acpi_dev_add_driver_gpios()
In reply to Andy ShevchenkoSwitch to use managed variant of acpi_dev_add_driver_gpios() to simplify error path and fix potentially wrong assignment if ->probe() fails.
--- sound/soc/intel/boards/bdw-rt5677.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/intel/boards/bdw-rt5677.c +1 -2
@@ -207,8 +207,7 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec);int ret; - ret =acpi_dev_add_driver_gpios (ACPI_COMPANION (codec->dev), - bdw_rt5677_gpios); + ret =devm_acpi_dev_add_driver_gpios (codec->dev, bdw_rt5677_gpios);if (ret)dev_warn (codec->dev,"Failed to add driver gpios\n" );
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: Intel: bdw-rt5677: Switch to devm_acpi_dev_add_driver_gpios()" to the asoc tree
The patch
ASoC: Intel: bdw-rt5677: Switch to devm_acpi_dev_add_driver_gpios()
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
0931352dcb4d2019bf1ec2a5457a41d1d6566509Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Thu, 15 Jun 2017 15:46:38 +0300
Subject: [PATCH] ASoC: Intel: bdw-rt5677: Switch to
devm_acpi_dev_add_driver_gpios()
Switch to use managed variant of acpi_dev_add_driver_gpios() to simplify error path and fix potentially wrong assignment if ->probe() fails.
--- sound/soc/intel/boards/bdw-rt5677.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/intel/boards/bdw-rt5677.c +1 -2
@@ -207,8 +207,7 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec);int ret; - ret =acpi_dev_add_driver_gpios (ACPI_COMPANION (codec->dev), - bdw_rt5677_gpios); + ret =devm_acpi_dev_add_driver_gpios (codec->dev, bdw_rt5677_gpios);if (ret)dev_warn (codec->dev,"Failed to add driver gpios\n" );
Signature · 1 line
2.11.0
Quoted 6 lines · Andy Shevchenko
There are few issues with current approach:
- ACPI enumeration should be done by IDs, and not by instances
- Platform code with board related stuff should reside in corresponding moduleFix those issues here.
Changelog v2:
- assign GPIO ACPI table to correct device in patch 2
Quoted 11 lines
Andy Shevchenko (3):
ASoC: rt5677: Introduce proper table for ACPI enumeration
ASoC: rt5677: Move platform code to board file
ASoC: Intel: bdw-rt5677: Switch todevm_acpi_dev_add_driver_gpios()sound/soc/codecs/rt5677.c | 32 +++++++---------------------
----
sound/soc/intel/boards/bdw-rt5677.c | 26 ++++++++++++++++++++++++++2 files changed, 33 insertions(+), 25 deletions(-)
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