ASoC: es7134: driver updates
Subsystems (3)
v2 cover ASoC: es7134: driver updates
This patchset fixes issues of v1 [0] around power supply requirement and add es7154 support.
AVDD is renamed to PVDD to better match the component datasheet. v1 assumed optional power supplies, which was a wrong thing do. Now VDD, is required on all chip variant and PVDD is required on the es7154.
[0]: https://lkml.kernel.org/r/[email protected]
Jerome Brunet (3):
ASoC: es7134: update DT binding with new compatible and supplies
ASoC: es7134: correct required power supplies
ASoC: es7134: add support for the es7154
.../devicetree/bindings/sound/everest,es7134.txt | 7 +- sound/soc/codecs/es7134.c | 104 ++++++++++++++++++++- 2 files changed, 106 insertions(+), 5 deletions(-)
Signature · 1 line
2.14.4
PATCH v2 1/3 ASoC: es7134: update DT binding with new compatible and supplies
Update the documentation to add support for the es7154 and optional power supplies phandles.
--- Documentation/devicetree/bindings/sound/everest,es7134.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/everest,es7134.txt +6 -1
@@ -1,10 +1,15 @@ ES7134 i2s DA converter Required properties: -- compatible : "everest,es7134" or "everest,es7144" +- compatible : "everest,es7134" or + "everest,es7144" or + "everest,es7154" +- VDD-supply : regulator phandle for the VDD supply +- PVDD-supply: regulator phandle for the PVDD supply for the es7154 Example: i2s_codec: external-codec { compatible = "everest,es7134"; + VDD-supply = <&vcc_5v>; };
Signature · 1 line
2.14.4
Mark Brown
maintainerApplied "ASoC: es7134: update DT binding with new compatible and supplies" to the asoc tree
The patch
ASoC: es7134: update DT binding with new compatible and supplies
has been applied to the asoc tree at
https://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
c9445d94d7fc60e7b0290df9e109daef85d26bd4Mon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Tue, 3 Jul 2018 17:05:58 +0200
Subject: [PATCH] ASoC: es7134: update DT binding with new compatible and
supplies
Update the documentation to add support for the es7154 and optional power supplies phandles.
--- Documentation/devicetree/bindings/sound/everest,es7134.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/everest,es7134.txt +6 -1
@@ -1,10 +1,15 @@ ES7134 i2s DA converter Required properties: -- compatible : "everest,es7134" or "everest,es7144" +- compatible : "everest,es7134" or + "everest,es7144" or + "everest,es7154" +- VDD-supply : regulator phandle for the VDD supply +- PVDD-supply: regulator phandle for the PVDD supply for the es7154 Example: i2s_codec: external-codec { compatible = "everest,es7134"; + VDD-supply = <&vcc_5v>; };
Signature · 1 line
2.18.0.rc2
PATCH v2 2/3 ASoC: es7134: correct required power supplies
In reply to Jerome BrunetDrop AVDD in favor of PVDD to match the names used in the datasheet and only claim PVDD on the es7154. The es7134 and es7144 don't have a separate supply for the digital I/O.
--- sound/soc/codecs/es7134.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-)
sound/soc/codecs/es7134.c +41 -3
@@ -35,6 +35,10 @@ struct es7134_clock_mode {struct es7134_chip {const struct es7134_clock_mode *modes;unsigned int mode_num; +const struct snd_soc_dapm_widget *extra_widgets; +unsigned int extra_widget_num; +const struct snd_soc_dapm_route *extra_routes; +unsigned int extra_route_num; };struct es7134_data {
@@ -110,6 +114,34 @@ static int es7134_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)return 0 ; } +static int es7134_component_probe (struct snd_soc_component *c) +{ +struct snd_soc_dapm_context *dapm =snd_soc_component_get_dapm (c); +struct es7134_data *priv =snd_soc_component_get_drvdata (c); +const struct es7134_chip *chip = priv->chip; +int ret; + +if (chip->extra_widget_num) { + ret =snd_soc_dapm_new_controls (dapm, chip->extra_widgets, + chip->extra_widget_num); +if (ret) { +dev_err (c->dev,"failed to add extra widgets\n" ); +return ret; + } + } + +if (chip->extra_route_num) { + ret =snd_soc_dapm_add_routes (dapm, chip->extra_routes, + chip->extra_route_num); +if (ret) { +dev_err (c->dev,"failed to add extra routes\n" ); +return ret; + } + } + +return 0 ; +} +static const struct snd_soc_dai_ops es7134_dai_ops = { .set_fmt = es7134_set_fmt, .hw_params = es7134_hw_params,
@@ -158,9 +190,16 @@ static const struct es7134_clock_mode es7134_modes[] = { }, }; +/* Digital I/O are also supplied by VDD on the es7134 */ +static const struct snd_soc_dapm_route es7134_extra_routes[] = { + {"Playback" ,NULL ,"VDD" , } +}; +static const struct es7134_chip es7134_chip = { .modes = es7134_modes, .mode_num =ARRAY_SIZE (es7134_modes), + .extra_routes = es7134_extra_routes, + .extra_route_num =ARRAY_SIZE (es7134_extra_routes), };static const struct snd_soc_dapm_widget es7134_dapm_widgets[] = {
@@ -168,17 +207,16 @@ static const struct snd_soc_dapm_widget es7134_dapm_widgets[] = {SND_SOC_DAPM_OUTPUT ("AOUTR" ),SND_SOC_DAPM_DAC ("DAC" ,"Playback" ,SND_SOC_NOPM ,0 ,0 ), SND_SOC_DAPM_REGULATOR_SUPPLY("VDD", 0, 0), - SND_SOC_DAPM_REGULATOR_SUPPLY("AVDD", 0, 0), };static const struct snd_soc_dapm_route es7134_dapm_routes[] = { {"AOUTL" ,NULL ,"DAC" }, {"AOUTR" ,NULL ,"DAC" }, - {"Playback" ,NULL ,"VDD" }, - {"DAC" ,NULL ,"AVDD" }, + {"DAC" ,NULL ,"VDD" }, };static const struct snd_soc_component_driver es7134_component_driver = { + .probe = es7134_component_probe, .dapm_widgets = es7134_dapm_widgets, .num_dapm_widgets =ARRAY_SIZE (es7134_dapm_widgets), .dapm_routes = es7134_dapm_routes,
Signature · 1 line
2.14.4
Mark Brown
maintainerApplied "ASoC: es7134: correct required power supplies" to the asoc tree
The patch
ASoC: es7134: correct required power supplies
has been applied to the asoc tree at
https://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
30ddfffd10b73d5d960650ea70b33a8ee0562679Mon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Tue, 3 Jul 2018 17:05:59 +0200
Subject: [PATCH] ASoC: es7134: correct required power supplies
Drop AVDD in favor of PVDD to match the names used in the datasheet and only claim PVDD on the es7154. The es7134 and es7144 don't have a separate supply for the digital I/O.
--- sound/soc/codecs/es7134.c | 44 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-)
sound/soc/codecs/es7134.c +41 -3
@@ -35,6 +35,10 @@ struct es7134_clock_mode {struct es7134_chip {const struct es7134_clock_mode *modes;unsigned int mode_num; +const struct snd_soc_dapm_widget *extra_widgets; +unsigned int extra_widget_num; +const struct snd_soc_dapm_route *extra_routes; +unsigned int extra_route_num; };struct es7134_data {
@@ -110,6 +114,34 @@ static int es7134_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)return 0 ; } +static int es7134_component_probe (struct snd_soc_component *c) +{ +struct snd_soc_dapm_context *dapm =snd_soc_component_get_dapm (c); +struct es7134_data *priv =snd_soc_component_get_drvdata (c); +const struct es7134_chip *chip = priv->chip; +int ret; + +if (chip->extra_widget_num) { + ret =snd_soc_dapm_new_controls (dapm, chip->extra_widgets, + chip->extra_widget_num); +if (ret) { +dev_err (c->dev,"failed to add extra widgets\n" ); +return ret; + } + } + +if (chip->extra_route_num) { + ret =snd_soc_dapm_add_routes (dapm, chip->extra_routes, + chip->extra_route_num); +if (ret) { +dev_err (c->dev,"failed to add extra routes\n" ); +return ret; + } + } + +return 0 ; +} +static const struct snd_soc_dai_ops es7134_dai_ops = { .set_fmt = es7134_set_fmt, .hw_params = es7134_hw_params,
@@ -158,9 +190,16 @@ static const struct es7134_clock_mode es7134_modes[] = { }, }; +/* Digital I/O are also supplied by VDD on the es7134 */ +static const struct snd_soc_dapm_route es7134_extra_routes[] = { + {"Playback" ,NULL ,"VDD" , } +}; +static const struct es7134_chip es7134_chip = { .modes = es7134_modes, .mode_num =ARRAY_SIZE (es7134_modes), + .extra_routes = es7134_extra_routes, + .extra_route_num =ARRAY_SIZE (es7134_extra_routes), };static const struct snd_soc_dapm_widget es7134_dapm_widgets[] = {
@@ -168,17 +207,16 @@ static const struct snd_soc_dapm_widget es7134_dapm_widgets[] = {SND_SOC_DAPM_OUTPUT ("AOUTR" ),SND_SOC_DAPM_DAC ("DAC" ,"Playback" ,SND_SOC_NOPM ,0 ,0 ), SND_SOC_DAPM_REGULATOR_SUPPLY("VDD", 0, 0), - SND_SOC_DAPM_REGULATOR_SUPPLY("AVDD", 0, 0), };static const struct snd_soc_dapm_route es7134_dapm_routes[] = { {"AOUTL" ,NULL ,"DAC" }, {"AOUTR" ,NULL ,"DAC" }, - {"Playback" ,NULL ,"VDD" }, - {"DAC" ,NULL ,"AVDD" }, + {"DAC" ,NULL ,"VDD" }, };static const struct snd_soc_component_driver es7134_component_driver = { + .probe = es7134_component_probe, .dapm_widgets = es7134_dapm_widgets, .num_dapm_widgets =ARRAY_SIZE (es7134_dapm_widgets), .dapm_routes = es7134_dapm_routes,
Signature · 1 line
2.18.0.rc2
PATCH v2 3/3 ASoC: es7134: add support for the es7154
In reply to Jerome BrunetAdd support for the es7154 which is basically an es7134 with an embedded power amplifier and lower maximum sample rate
--- sound/soc/codecs/es7134.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-)
sound/soc/codecs/es7134.c +59 -1
@@ -33,6 +33,7 @@ struct es7134_clock_mode { };struct es7134_chip { +struct snd_soc_dai_driver *dai_drv;const struct es7134_clock_mode *modes;unsigned int mode_num;const struct snd_soc_dapm_widget *extra_widgets;
@@ -196,6 +197,7 @@ static const struct snd_soc_dapm_route es7134_extra_routes[] = { };static const struct es7134_chip es7134_chip = { + .dai_drv = &es7134_dai, .modes = es7134_modes, .mode_num =ARRAY_SIZE (es7134_modes), .extra_routes = es7134_extra_routes,
@@ -227,6 +229,61 @@ static const struct snd_soc_component_driver es7134_component_driver = { .non_legacy_dai_naming = 1, }; +static struct snd_soc_dai_driver es7154_dai = { + .name ="es7154-hifi" , + .playback = { + .stream_name ="Playback" , + .channels_min =2 , + .channels_max =2 , + .rates = (SNDRV_PCM_RATE_8000_48000 | +SNDRV_PCM_RATE_88200 | +SNDRV_PCM_RATE_96000 ), + .formats = (SNDRV_PCM_FMTBIT_S16_LE | +SNDRV_PCM_FMTBIT_S18_3LE | +SNDRV_PCM_FMTBIT_S20_3LE | +SNDRV_PCM_FMTBIT_S24_3LE | +SNDRV_PCM_FMTBIT_S24_LE ), + }, + .ops = &es7134_dai_ops, +}; + +static const struct es7134_clock_mode es7154_modes[] = { + { +/* Single speed mode */ + .rate_min =8000 , + .rate_max =50000 , + .mclk_fs = (unsigned int []) {32 ,64 ,128 ,192 ,256 , +384 ,512 ,768 ,1024 }, + .mclk_fs_num =9 , + }, { +/* Double speed mode */ + .rate_min =84000 , + .rate_max =100000 , + .mclk_fs = (unsigned int []) {128 ,192 ,256 ,384 ,512 , +768 ,1024 }, + .mclk_fs_num =7 , + } +}; + +/* Es7154 has a separate supply for digital I/O */ +static const struct snd_soc_dapm_widget es7154_extra_widgets[] = { +SND_SOC_DAPM_REGULATOR_SUPPLY ("PVDD" ,0 ,0 ), +}; + +static const struct snd_soc_dapm_route es7154_extra_routes[] = { + {"Playback" ,NULL ,"PVDD" , } +}; + +static const struct es7134_chip es7154_chip = { + .dai_drv = &es7154_dai, + .modes = es7154_modes, + .mode_num =ARRAY_SIZE (es7154_modes), + .extra_routes = es7154_extra_routes, + .extra_route_num =ARRAY_SIZE (es7154_extra_routes), + .extra_widgets = es7154_extra_widgets, + .extra_widget_num =ARRAY_SIZE (es7154_extra_widgets), +}; +static int es7134_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -245,13 +302,14 @@ static int es7134_probe(struct platform_device *pdev)return devm_snd_soc_register_component (&pdev->dev, &es7134_component_driver, - &es7134_dai,1 ); + priv->chip->dai_drv,1 ); }#ifdef CONFIG_OF static const struct of_device_id es7134_ids[] = { { .compatible ="everest,es7134" , .data = &es7134_chip }, { .compatible ="everest,es7144" , .data = &es7134_chip }, + { .compatible ="everest,es7154" , .data = &es7154_chip }, { } };MODULE_DEVICE_TABLE (of, es7134_ids);
Signature · 1 line
2.14.4
Mark Brown
maintainerApplied "ASoC: es7134: add support for the es7154" to the asoc tree
The patch
ASoC: es7134: add support for the es7154
has been applied to the asoc tree at
https://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
563c263248ff37dcd743549a0c0932fe2bf83980Mon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Tue, 3 Jul 2018 17:06:00 +0200
Subject: [PATCH] ASoC: es7134: add support for the es7154
Add support for the es7154 which is basically an es7134 with an embedded power amplifier and lower maximum sample rate
--- sound/soc/codecs/es7134.c | 60 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-)
sound/soc/codecs/es7134.c +59 -1
@@ -33,6 +33,7 @@ struct es7134_clock_mode { };struct es7134_chip { +struct snd_soc_dai_driver *dai_drv;const struct es7134_clock_mode *modes;unsigned int mode_num;const struct snd_soc_dapm_widget *extra_widgets;
@@ -196,6 +197,7 @@ static const struct snd_soc_dapm_route es7134_extra_routes[] = { };static const struct es7134_chip es7134_chip = { + .dai_drv = &es7134_dai, .modes = es7134_modes, .mode_num =ARRAY_SIZE (es7134_modes), .extra_routes = es7134_extra_routes,
@@ -227,6 +229,61 @@ static const struct snd_soc_component_driver es7134_component_driver = { .non_legacy_dai_naming = 1, }; +static struct snd_soc_dai_driver es7154_dai = { + .name ="es7154-hifi" , + .playback = { + .stream_name ="Playback" , + .channels_min =2 , + .channels_max =2 , + .rates = (SNDRV_PCM_RATE_8000_48000 | +SNDRV_PCM_RATE_88200 | +SNDRV_PCM_RATE_96000 ), + .formats = (SNDRV_PCM_FMTBIT_S16_LE | +SNDRV_PCM_FMTBIT_S18_3LE | +SNDRV_PCM_FMTBIT_S20_3LE | +SNDRV_PCM_FMTBIT_S24_3LE | +SNDRV_PCM_FMTBIT_S24_LE ), + }, + .ops = &es7134_dai_ops, +}; + +static const struct es7134_clock_mode es7154_modes[] = { + { +/* Single speed mode */ + .rate_min =8000 , + .rate_max =50000 , + .mclk_fs = (unsigned int []) {32 ,64 ,128 ,192 ,256 , +384 ,512 ,768 ,1024 }, + .mclk_fs_num =9 , + }, { +/* Double speed mode */ + .rate_min =84000 , + .rate_max =100000 , + .mclk_fs = (unsigned int []) {128 ,192 ,256 ,384 ,512 , +768 ,1024 }, + .mclk_fs_num =7 , + } +}; + +/* Es7154 has a separate supply for digital I/O */ +static const struct snd_soc_dapm_widget es7154_extra_widgets[] = { +SND_SOC_DAPM_REGULATOR_SUPPLY ("PVDD" ,0 ,0 ), +}; + +static const struct snd_soc_dapm_route es7154_extra_routes[] = { + {"Playback" ,NULL ,"PVDD" , } +}; + +static const struct es7134_chip es7154_chip = { + .dai_drv = &es7154_dai, + .modes = es7154_modes, + .mode_num =ARRAY_SIZE (es7154_modes), + .extra_routes = es7154_extra_routes, + .extra_route_num =ARRAY_SIZE (es7154_extra_routes), + .extra_widgets = es7154_extra_widgets, + .extra_widget_num =ARRAY_SIZE (es7154_extra_widgets), +}; +static int es7134_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -245,13 +302,14 @@ static int es7134_probe(struct platform_device *pdev)return devm_snd_soc_register_component (&pdev->dev, &es7134_component_driver, - &es7134_dai,1 ); + priv->chip->dai_drv,1 ); }#ifdef CONFIG_OF static const struct of_device_id es7134_ids[] = { { .compatible ="everest,es7134" , .data = &es7134_chip }, { .compatible ="everest,es7144" , .data = &es7134_chip }, + { .compatible ="everest,es7154" , .data = &es7154_chip }, { } };MODULE_DEVICE_TABLE (of, es7134_ids);
Signature · 1 line
2.18.0.rc2