March 2023 - Alsa-devel - mailman.alsa-project.org

[PATCH] ASoC: soc-core.c: remove useless dev_dbg()
by Kuninori Morimoto 06 Mar '23

06 Mar '23

soc-core.c is using dev_dbg(), but some of them are useless. It indicates many dev_dbg() at snd_soc_runtime_get_dai_fmt(), but all of them are just noise, almost no meanings. dev_dbg() on soc_probe_link_dais() indicates dai link and its loop order, but it is just noise, no information. dev_dbg() on snd_soc_register_dai() is duplicated. This patch cleanup these. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-core.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 71b022f7edfd..2faa0d8d0d8e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1033,7 +1033,6 @@ static void snd_soc_runtime_get_dai_fmt(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai *dai, *not_used; - struct device *dev = rtd->dev; u64 pos, possible_fmt; unsigned int mask = 0, dai_fmt = 0; int i, j, priority, pri, until; @@ -1075,8 +1074,6 @@ static void snd_soc_runtime_get_dai_fmt(struct snd_soc_pcm_runtime *rtd) */ until = snd_soc_dai_get_fmt_max_priority(rtd); for (priority = 1; priority <= until; priority++) { - - dev_dbg(dev, "priority = %d\n", priority); for_each_rtd_dais(rtd, j, not_used) { possible_fmt = ULLONG_MAX; @@ -1085,7 +1082,6 @@ static void snd_soc_runtime_get_dai_fmt(struct snd_soc_pcm_runtime *rtd) pri = (j >= i) ? priority : priority - 1; fmt = snd_soc_dai_get_fmt(dai, pri); - dev_dbg(dev, "%s: (pri, fmt) = (%d, %016llX)\n", dai->name, pri, fmt); possible_fmt &= fmt; } if (possible_fmt) @@ -1095,8 +1091,6 @@ static void snd_soc_runtime_get_dai_fmt(struct snd_soc_pcm_runtime *rtd) /* Not Found */ return; found: - dev_dbg(dev, "found auto selected format: %016llX\n", possible_fmt); - /* * convert POSSIBLE_DAIFMT to DAIFMT * @@ -1457,11 +1451,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card) for_each_comp_order(order) { for_each_card_rtds(card, rtd) { - - dev_dbg(card->dev, - "ASoC: probe %s dai link %d late %d\n", - card->name, rtd->num, order); - /* probe all rtd connected DAIs in good order */ ret = snd_soc_pcm_dai_probe(rtd, order); if (ret) @@ -2421,8 +2410,6 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, struct device *dev = component->dev; struct snd_soc_dai *dai; - dev_dbg(dev, "ASoC: dynamically register DAI %s\n", dev_name(dev)); - lockdep_assert_held(&client_mutex); dai = devm_kzalloc(dev, sizeof(*dai), GFP_KERNEL); -- 2.25.1

2 1

[PATCH v7 0/4] Add CS35L41 shared boost feature
by Lucas Tanure 06 Mar '23

06 Mar '23

Valve's Steam Deck uses CS35L41 in shared boost mode, where both speakers share the boost circuit. Add this support in the shared lib, but for now, shared boost is not supported in HDA systems as would require BIOS changes. Based on David Rhodes shared boost patches. Also, fix boost config overwriting in IRQ found in the review and do a small refactor of the code. Changes from V6: - Fix TX/RX bits in passive amp Changes from V5: - Improved documentation from Cirrrus - All amps use MDSCYN for boost source - Active amp has TX and RX enabled Changes from V4: - Fix Document subject Changes from V3: - Fix wrong code sent - Fix ISO C90 mixed declarations and code Changes from V2: - Drop External boost without VSPK Documentation - Move Shared boost to use values 2 and 3 - Revert back to reg_sequence but reading the value first and only update the necessary bits - Fix bug found by Intel kernel Test Robot Changes from V1: - Fix Documentation patch subject - New patch for External boost without VSPK Documentation - New patch to fix boost IRQ overwriting issue - New patch to refactor IRQ release error code - reinit_completion on pcm_startup - fix DRE switch overwriting - return IRQ_HANDLED in PLL_LOCK case Lucas Tanure (4): ASoC: cs35l41: Only disable internal boost ASoC: cs35l41: Refactor error release code ALSA: cs35l41: Add shared boost feature ASoC: dt-bindings: cirrus,cs35l41: Document CS35l41 shared boost .../bindings/sound/cirrus,cs35l41.yaml | 10 +- include/sound/cs35l41.h | 13 +- sound/pci/hda/cs35l41_hda.c | 6 +- sound/soc/codecs/cs35l41-lib.c | 73 +++++++++- sound/soc/codecs/cs35l41.c | 125 +++++++++--------- sound/soc/codecs/cs35l41.h | 1 + 6 files changed, 157 insertions(+), 71 deletions(-) -- 2.39.2

4 7

[PATCH v7 00/10] Add the PowerQUICC audio support using the QMC
by Herve Codina 06 Mar '23

06 Mar '23

Hi, This series adds support for audio using the QMC controller available in some Freescale PowerQUICC SoCs. This series contains three parts in order to show the different blocks hierarchy and their usage in this support. The first one is related to TSA (Time Slot Assigner). The TSA handles the data present at the pin level (TDM with up to 64 time slots) and dispatchs them to one or more serial controller (SCC). The second is related to QMC (QUICC Multichannel Controller). The QMC handles the data at the serial controller (SCC) level and splits again the data to creates some virtual channels. The last one is related to the audio component (QMC audio). It is the glue between the QMC controller and the ASoC component. It handles one or more QMC virtual channels and creates one DAI per QMC virtual channels handled. Compared to the previous iteration https://lore.kernel.org/linux-kernel/20230217145645.1768659-1-herve.codina@… this v7 series: - remove '#fsl,serial-cells' (TSA) and '#fsl,chan-cells' (QMC) properties - Fix the QMC timeslots mask generation in case of 64 timeslots Best regards, Herve Codina Changes v6 -> v7 - Patch 1 Remove #fsl,serial-cells Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 2, 3, 7, 8 and 10 Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 5 Remove #fsl,chan-cells Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 6 Fix the timeslot assigned mask in case of 64 timeslots - Patch 9 Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' Add 'Tested-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' Changes v5 -> v6 - Patch 1 Fix blank lines and spaces Remove fsl,diagnostic-mode Add some maxItems values Renamed fsl,tsa.h to cpm1-fsl,tsa.h - Patch 2 Remove fsl,diagnostic-mode Renamed fsl,tsa.h to cpm1-fsl,tsa.h Add 'Acked-by: Li Yang <leoyang.li(a)nxp.com>' - Patch 3 Renamed fsl,tsa.h to cpm1-fsl,tsa.h - Patch 5 Renamed fsl,tsa.h to cpm1-fsl,tsa.h Add 'Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>' Changes v4 -> v5 - patch 1 Rename fsl,tsa.yaml to fsl,cpm1-tsa.yaml Rename #serial-cells to #fsl,serial-cells and add a description Fix typos Remove examples present in description Use a pattern property for fsl,[rt]x-ts-routes - patch 2 Remove one left out_8() ppc specific function call Remove the no more needed PPC dependency in case of COMPILE_TEST - patch 4 Add 'Acked-by: Michael Ellerman <mpe(a)ellerman.id.au>' - patch 5 Rename fsl,qmc.yaml to fsl,cpm1-scc-qmc.yaml Rename #chan-cells to #fsl,chan-cells and add a description - patch 6 Add the SOC_FSL dependency in case of COMPILE_TEST (issue raised by the kernel test robot). Fix a typo in commit log Add 'Acked-by: Li Yang <leoyang.li(a)nxp.com>' Changes v3 -> v4 - patches 2, 6 and 9 Update code comment format. - patch 1 Fix some description formats. Add 'additionalProperties: false' in subnode. Move fsl,mode to fsl,diagnostic-mode. Change clocks and clock-names properties. Add '#serial-cells' property related to the newly introduced fsl,tsa-serial phandle. - patch 2 Move fsl,mode to fsl,diagnostic-mode. Replace the fsl,tsa phandle and the fsl,tsa-cell-id property by a fsl,tsa-serial phandle and update the related API. Add missing locks. - patch 5 Fix some description format. Replace the fsl,tsa phandle and the fsl,tsa-cell-id property by a fsl,tsa-serial phandle. Rename fsl,mode to fsl,operational-mode and update its description. - patch 6 Replace the fsl,tsa phandle and the fsl,tsa-cell-id property by a fsl,tsa-serial phandle and use the TSA updated API. Rename fsl,mode to fsl,operational-mode. - patch 8 Add 'Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>' Changes v2 -> v3 - All bindings Rename fsl-tsa.h to fsl,tsa.h Add missing vendor prefix Various fixes (quotes, node names, upper/lower case) - patches 1 and 2 (TSA binding specific) Remove 'reserved' values in the routing tables Remove fsl,grant-mode Add a better description for 'fsl,common-rxtx-pins' Fix clocks/clocks-name handling against fsl,common-rxtx-pins Add information related to the delays unit Removed FSL_CPM_TSA_NBCELL Fix license in binding header file fsl,tsa.h - patches 5 and 6 (QMC binding specific) Remove fsl,cpm-command property Add interrupt property constraint - patches 8 and 9 (QMC audio binding specific) Remove 'items' in compatible property definition Add missing 'dai-common.yaml' reference Fix the qmc_chan phandle definition - patch 2 and 6 Use io{read,write}be{32,16} Change commit subjects and logs - patch 4 Add 'Acked-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' Changes v1 -> v2: - patch 2 and 6 Fix kernel test robot errors - other patches No changes Herve Codina (10): dt-bindings: soc: fsl: cpm_qe: Add TSA controller soc: fsl: cpm1: Add support for TSA MAINTAINERS: add the Freescale TSA controller entry powerpc/8xx: Use a larger CPM1 command check mask dt-bindings: soc: fsl: cpm_qe: Add QMC controller soc: fsl: cpm1: Add support for QMC MAINTAINERS: add the Freescale QMC controller entry dt-bindings: sound: Add support for QMC audio ASoC: fsl: Add support for QMC audio MAINTAINERS: add the Freescale QMC audio entry .../soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml | 162 ++ .../bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml | 205 +++ .../bindings/sound/fsl,qmc-audio.yaml | 117 ++ MAINTAINERS | 25 + arch/powerpc/platforms/8xx/cpm1.c | 2 +- drivers/soc/fsl/qe/Kconfig | 23 + drivers/soc/fsl/qe/Makefile | 2 + drivers/soc/fsl/qe/qmc.c | 1537 +++++++++++++++++ drivers/soc/fsl/qe/tsa.c | 846 +++++++++ drivers/soc/fsl/qe/tsa.h | 42 + include/dt-bindings/soc/cpm1-fsl,tsa.h | 13 + include/soc/fsl/qe/qmc.h | 71 + sound/soc/fsl/Kconfig | 9 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_qmc_audio.c | 735 ++++++++ 15 files changed, 3790 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml create mode 100644 Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml create mode 100644 drivers/soc/fsl/qe/qmc.c create mode 100644 drivers/soc/fsl/qe/tsa.c create mode 100644 drivers/soc/fsl/qe/tsa.h create mode 100644 include/dt-bindings/soc/cpm1-fsl,tsa.h create mode 100644 include/soc/fsl/qe/qmc.h create mode 100644 sound/soc/fsl/fsl_qmc_audio.c -- 2.39.2

2 11

soundwire: user space test utilities
by Muni Sekhar 06 Mar '23

06 Mar '23

Hi all, I am looking for any existing user space test utilities to test SOUNDWIRE SUBSYSTEM in Linux kernel. Can someone please point me to this. -- Thanks, Sekhar

2 4

[PATCH v6 00/10] Add the PowerQUICC audio support using the QMC
by Herve Codina 06 Mar '23

06 Mar '23

Hi, This series adds support for audio using the QMC controller available in some Freescale PowerQUICC SoCs. This series contains three parts in order to show the different blocks hierarchy and their usage in this support. The first one is related to TSA (Time Slot Assigner). The TSA handles the data present at the pin level (TDM with up to 64 time slots) and dispatchs them to one or more serial controller (SCC). The second is related to QMC (QUICC Multichannel Controller). The QMC handles the data at the serial controller (SCC) level and splits again the data to creates some virtual channels. The last one is related to the audio component (QMC audio). It is the glue between the QMC controller and the ASoC component. It handles one or more QMC virtual channels and creates one DAI per QMC virtual channels handled. Compared to the previous iteration https://lore.kernel.org/linux-kernel/20230216134226.1692107-1-herve.codina@… this v6 series mainly: - fixes bindings Best regards, Herve Codina Changes v5 -> v6 - Patch 1 Fix blank lines and spaces Remove fsl,diagnostic-mode Add some maxItems values Renamed fsl,tsa.h to cpm1-fsl,tsa.h - Patch 2 Remove fsl,diagnostic-mode Renamed fsl,tsa.h to cpm1-fsl,tsa.h Add 'Acked-by: Li Yang <leoyang.li(a)nxp.com>' - Patch 3 Renamed fsl,tsa.h to cpm1-fsl,tsa.h - Patch 5 Renamed fsl,tsa.h to cpm1-fsl,tsa.h Add 'Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>' Changes v4 -> v5 - patch 1 Rename fsl,tsa.yaml to fsl,cpm1-tsa.yaml Rename #serial-cells to #fsl,serial-cells and add a description Fix typos Remove examples present in description Use a pattern property for fsl,[rt]x-ts-routes - patch 2 Remove one left out_8() ppc specific function call Remove the no more needed PPC dependency in case of COMPILE_TEST - patch 4 Add 'Acked-by: Michael Ellerman <mpe(a)ellerman.id.au>' - patch 5 Rename fsl,qmc.yaml to fsl,cpm1-scc-qmc.yaml Rename #chan-cells to #fsl,chan-cells and add a description - patch 6 Add the SOC_FSL dependency in case of COMPILE_TEST (issue raised by the kernel test robot). Fix a typo in commit log Add 'Acked-by: Li Yang <leoyang.li(a)nxp.com>' Changes v3 -> v4 - patches 2, 6 and 9 Update code comment format. - patch 1 Fix some description formats. Add 'additionalProperties: false' in subnode. Move fsl,mode to fsl,diagnostic-mode. Change clocks and clock-names properties. Add '#serial-cells' property related to the newly introduced fsl,tsa-serial phandle. - patch 2 Move fsl,mode to fsl,diagnostic-mode. Replace the fsl,tsa phandle and the fsl,tsa-cell-id property by a fsl,tsa-serial phandle and update the related API. Add missing locks. - patch 5 Fix some description format. Replace the fsl,tsa phandle and the fsl,tsa-cell-id property by a fsl,tsa-serial phandle. Rename fsl,mode to fsl,operational-mode and update its description. - patch 6 Replace the fsl,tsa phandle and the fsl,tsa-cell-id property by a fsl,tsa-serial phandle and use the TSA updated API. Rename fsl,mode to fsl,operational-mode. - patch 8 Add 'Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>' Changes v2 -> v3 - All bindings Rename fsl-tsa.h to fsl,tsa.h Add missing vendor prefix Various fixes (quotes, node names, upper/lower case) - patches 1 and 2 (TSA binding specific) Remove 'reserved' values in the routing tables Remove fsl,grant-mode Add a better description for 'fsl,common-rxtx-pins' Fix clocks/clocks-name handling against fsl,common-rxtx-pins Add information related to the delays unit Removed FSL_CPM_TSA_NBCELL Fix license in binding header file fsl,tsa.h - patches 5 and 6 (QMC binding specific) Remove fsl,cpm-command property Add interrupt property constraint - patches 8 and 9 (QMC audio binding specific) Remove 'items' in compatible property definition Add missing 'dai-common.yaml' reference Fix the qmc_chan phandle definition - patch 2 and 6 Use io{read,write}be{32,16} Change commit subjects and logs - patch 4 Add 'Acked-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' Changes v1 -> v2: - patch 2 and 6 Fix kernel test robot errors - other patches No changes Herve Codina (10): dt-bindings: soc: fsl: cpm_qe: Add TSA controller soc: fsl: cpm1: Add support for TSA MAINTAINERS: add the Freescale TSA controller entry powerpc/8xx: Use a larger CPM1 command check mask dt-bindings: soc: fsl: cpm_qe: Add QMC controller soc: fsl: cpm1: Add support for QMC MAINTAINERS: add the Freescale QMC controller entry dt-bindings: sound: Add support for QMC audio ASoC: fsl: Add support for QMC audio MAINTAINERS: add the Freescale QMC audio entry .../soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml | 172 ++ .../bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml | 215 +++ .../bindings/sound/fsl,qmc-audio.yaml | 117 ++ MAINTAINERS | 25 + arch/powerpc/platforms/8xx/cpm1.c | 2 +- drivers/soc/fsl/qe/Kconfig | 23 + drivers/soc/fsl/qe/Makefile | 2 + drivers/soc/fsl/qe/qmc.c | 1533 +++++++++++++++++ drivers/soc/fsl/qe/tsa.c | 846 +++++++++ drivers/soc/fsl/qe/tsa.h | 42 + include/dt-bindings/soc/cpm1-fsl,tsa.h | 13 + include/soc/fsl/qe/qmc.h | 71 + sound/soc/fsl/Kconfig | 9 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_qmc_audio.c | 735 ++++++++ 15 files changed, 3806 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml create mode 100644 Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml create mode 100644 drivers/soc/fsl/qe/qmc.c create mode 100644 drivers/soc/fsl/qe/tsa.c create mode 100644 drivers/soc/fsl/qe/tsa.h create mode 100644 include/dt-bindings/soc/cpm1-fsl,tsa.h create mode 100644 include/soc/fsl/qe/qmc.h create mode 100644 sound/soc/fsl/fsl_qmc_audio.c -- 2.39.1

3 21

sof-hda-dsp: Add speaker led support
by GitHub pull_request - opened 06 Mar '23

06 Mar '23

alsa-project/alsa-ucm-conf pull request #286 was opened from Kobatw: There's a speaker led on Dell G16 and use sof-hda-dsp to control. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/286 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/286.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2] ASoC: Intel: avs: Use struct_size for struct avs_modcfg_ext size
by Jacob Keller 06 Mar '23

06 Mar '23

The struct avs_modcfg_ext structure has a flexible array member for the pin_fmts array, and the size should be calculated using struct_size to prevent the potential for overflow with the allocation. Reviewed-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Reviewed-by: "Amadeusz Sławiński" <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Jacob Keller <jacob.e.keller(a)intel.com> --- sound/soc/intel/avs/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c index 05302ab705ae..adbe23a47847 100644 --- a/sound/soc/intel/avs/path.c +++ b/sound/soc/intel/avs/path.c @@ -478,7 +478,7 @@ static int avs_modext_create(struct avs_dev *adev, struct avs_path_module *mod) int ret, i; num_pins = tcfg->generic.num_input_pins + tcfg->generic.num_output_pins; - cfg_size = sizeof(*cfg) + sizeof(*cfg->pin_fmts) * num_pins; + cfg_size = struct_size(cfg, pin_fmts, num_pins); cfg = kzalloc(cfg_size, GFP_KERNEL); if (!cfg) base-commit: ee3f96b164688dae21e2466a57f2e806b64e8a37 -- 2.39.1.405.gd4c25cc71f83

2 1

[PATCH 1/2] ASoC: dt-bindings: qcom,wcd934x: Reference dai-common
by Krzysztof Kozlowski 06 Mar '23

06 Mar '23

Reference common DAI properties to get sound-dai-cells description and allow name-prefix. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml index ea09590bfa30..ae8346b9d332 100644 --- a/Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml @@ -151,6 +151,7 @@ required: - reg allOf: + - $ref: dai-common.yaml# - if: required: - slim-ifc-dev -- 2.34.1

3 4

[PATCH 0/8] ASoC: microchip: some cleanups for AT91 sound drivers
by Claudiu Beznea 06 Mar '23

06 Mar '23

Hi, The following patches do some cleanups for Microchip AT91 sound drivers. Along with it I took the chance and updated MAINTAINERS file. Thank you, Claudiu Beznea Claudiu Beznea (8): ASoC: mchp-spdiftx: use FIELD_PREP() where possible ASoC: mchp-spdiftx: use regmap_update_bits() ASoC: mchp-spdiftx: update debug message ASoC: mchp-pdmc: use FIELD_PREP() where possible ASoC: mchp-pdmc: return directly ret ASoC: mchp-pdmc: avoid casting to/from void pointer MAINTAINERS: add myself as maintainer for Microchip AT91 sound drivers MAINTAINERS: update Microchip AT91 sound entries with documentation files MAINTAINERS | 9 +++++-- sound/soc/atmel/mchp-pdmc.c | 19 ++++++-------- sound/soc/atmel/mchp-spdiftx.c | 45 ++++++++++++---------------------- 3 files changed, 29 insertions(+), 44 deletions(-) -- 2.34.1

3 11

[PATCH] ASoC: qcom: common: add kcontrol to jack pins
by Srinivas Kandagatla 06 Mar '23

06 Mar '23

Add Kcontrol to jack pins so that device switch in ucm can be done correctly. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/qcom/common.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 96fe80241fb4..c1f24af17506 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -180,6 +180,18 @@ int qcom_snd_parse_of(struct snd_soc_card *card) } EXPORT_SYMBOL_GPL(qcom_snd_parse_of); +static struct snd_soc_jack_pin qcom_headset_jack_pins[] = { + /* Headset */ + { + .pin = "Mic Jack", + .mask = SND_JACK_MICROPHONE, + }, + { + .pin = "Headphone Jack", + .mask = SND_JACK_HEADPHONE, + }, +}; + int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack, bool *jack_setup) { @@ -189,13 +201,14 @@ int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, int rval, i; if (!*jack_setup) { - rval = snd_soc_card_jack_new(card, "Headset Jack", + rval = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_LINEOUT | SND_JACK_MECHANICAL | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5, - jack); + jack, qcom_headset_jack_pins, + ARRAY_SIZE(qcom_headset_jack_pins)); if (rval < 0) { dev_err(card->dev, "Unable to add Headphone Jack\n"); -- 2.21.0

2 1