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

[alsa-devel] [PATCH v2] ASoC: max9867: Drop probe function
by Ladislav Michl 02 Mar '18

02 Mar '18

Driver probe function has no use and can be deleted. Signed-off-by: Ladislav Michl <ladis(a)linux-mips.org> --- Changes: - v2: Rebased against Mark's current tree Mark, is this what you asked for? It does not make much sense to me as you have to redo the work I wanted to save you... sound/soc/codecs/max9867.c | 10 ---------- sound/soc/codecs/max9867.h | 1 - 2 files changed, 11 deletions(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index 2f60924fe919..6b128dd6c5dd 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -404,17 +404,7 @@ static int max9867_resume(struct device *dev) } #endif -static int max9867_probe(struct snd_soc_codec *codec) -{ - struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); - - dev_dbg(codec->dev, "max98090_probe\n"); - max9867->codec = codec; - return 0; -} - static const struct snd_soc_codec_driver max9867_codec = { - .probe = max9867_probe, .component_driver = { .controls = max9867_snd_controls, .num_controls = ARRAY_SIZE(max9867_snd_controls), diff --git a/sound/soc/codecs/max9867.h b/sound/soc/codecs/max9867.h index 65590b4ad62a..55cd9976ff47 100644 --- a/sound/soc/codecs/max9867.h +++ b/sound/soc/codecs/max9867.h @@ -75,7 +75,6 @@ /* codec private data */ struct max9867_priv { struct regmap *regmap; - struct snd_soc_codec *codec; unsigned int sysclk; unsigned int pclk; unsigned int master; -- 2.16.2

2 1

[alsa-devel] [PATCH] ASoC: Intel: Fix cht_bsw_nau8824 machine driver build error
by Hans de Goede 02 Mar '18

02 Mar '18

The cht_bsw_nau8824 machine driver is passing snd_soc_codec to nau8824_enable_jack_detect(), but that expects a snd_soc_component as argument, causing a compile error. This commit fixes this. Fixes: 5b00ce63e07f ("ASoC: Intel: add nau8824 sound card") Cc: John Hsu <KCHSU0(a)nuvoton.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/intel/boards/cht_bsw_nau8824.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c index 08d0b8128fab..5913ad159cc1 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -103,7 +103,6 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) { struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); struct snd_soc_jack *jack = &ctx->jack; - struct snd_soc_codec *codec = runtime->codec; struct snd_soc_dai *codec_dai = runtime->codec_dai; int ret, jack_type; @@ -134,7 +133,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - nau8824_enable_jack_detect(codec, jack); + nau8824_enable_jack_detect(codec_dai->component, jack); return ret; } -- 2.14.3

2 1

[alsa-devel] [PATCH v2 0/3] Enable HDA Codec support on Intel Platforms (Series1)
by Rakesh Ughreja 02 Mar '18

02 Mar '18

Enhanced HD Audio capabilities introduced in HD Audio controllers are added in backward compatible way i.e. it does not change the behavior of the controller with respect to HDA Bus and HDA devices. Since there is no change in the hardware with respect to the HDA bus and HDA device it is more appropriate to represent the same in software as well. In order to align software representation with hardware it makes more sense to have common data structures across device, bus and driver for both enhanced HDA controllers and legacy HDA controllers. This patch series removes the hdac_ext_device structure, hdac_ext_bus and hdac_ext_driver data structures so that legacy and enhanced HDaudio capabilities can be handled in a backward-compatible way without separate definitions. Once this clean-up is complete, additional patches will allow for HDaudio codec support in an ASoC framework without the need to develop new codec drivers, thereby enabling the use of the Intel DSP on more platforms (currently limited to hdmi). Changes v2: - No functionality changes in this series except rebase. Rakesh Ughreja (3): ALSA: hdac: Remove usage of struct hdac_ext_device and use hdac_device instead ALSA: hdac: Remove usage of struct hdac_ext_bus and use hdac_bus instead ALSA: hdac: Remove usage of struct hdac_ext_driver, use hdac_driver instead include/sound/hdaudio.h | 20 ++ include/sound/hdaudio_ext.h | 119 +++------- sound/hda/ext/hdac_ext_bus.c | 76 +++--- sound/hda/ext/hdac_ext_controller.c | 55 +++-- sound/hda/ext/hdac_ext_stream.c | 104 ++++----- sound/soc/codecs/hdac_hdmi.c | 416 ++++++++++++++++----------------- sound/soc/intel/skylake/skl-messages.c | 50 ++-- sound/soc/intel/skylake/skl-nhlt.c | 8 +- sound/soc/intel/skylake/skl-pcm.c | 112 +++++---- sound/soc/intel/skylake/skl-topology.c | 20 +- sound/soc/intel/skylake/skl-topology.h | 6 +- sound/soc/intel/skylake/skl.c | 178 +++++++------- sound/soc/intel/skylake/skl.h | 7 +- 13 files changed, 522 insertions(+), 649 deletions(-) -- 2.7.4

2 4

[alsa-devel] [PATCH v2 00/10] Enable HDA Codec support on Intel Platforms (Series2)
by Rakesh Ughreja 02 Mar '18

02 Mar '18

Many Intel platforms (SKL, KBL) etc. in the market supports enhanced audio capabilities which also includes DSP processing. This patch carry forwards the work that is done in the previous series to enable HD Audio codecs on such platforms. This patch series adds ASoC HDA codec driver for Intel platforms. It is written by reusing the legacy HDA ALSA codec driver. Intention is to maximize the reuse and minimize the changes in the legacy HDA codec driver. Changes in v2: - Resolved review comments and rebased to latest kernel. - added module load support for codec drivers. Rakesh Ughreja (10): ALSA - Ext hda: add wait for codec to respond after link reset ASoC: Intel: Boards: Machine driver for Intel platforms ASoC: Intel: Skylake: Add entry in sst_acpi_mach for HDA codecs ASoC: Intel: Skylake: add HDA BE DAIs ASoC: Intel: Skylake: use hda_bus instead of hdac_bus ALSA: hda - split snd_hda_codec_new function ALSA: hdac: remove memory allocation from snd_hdac_ext_bus_device_init ALSA: hdac: add extended ops in the hdac_bus ASoC: hdac_hda: add asoc extension for legacy HDA codec drivers ASoC: Intel: Boards: add support for HDA codecs include/sound/hdaudio.h | 9 + include/sound/hdaudio_ext.h | 6 +- sound/hda/ext/hdac_ext_bus.c | 12 +- sound/hda/ext/hdac_ext_controller.c | 8 + sound/pci/hda/hda_bind.c | 12 + sound/pci/hda/hda_codec.c | 68 +++- sound/pci/hda/hda_codec.h | 2 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdac_hda.c | 464 +++++++++++++++++++++++++++ sound/soc/codecs/hdac_hda.h | 23 ++ sound/soc/intel/boards/Kconfig | 9 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_hda_dsp_common.c | 131 ++++++++ sound/soc/intel/boards/skl_hda_dsp_common.h | 35 ++ sound/soc/intel/boards/skl_hda_dsp_generic.c | 175 ++++++++++ sound/soc/intel/skylake/skl-pcm.c | 70 +++- sound/soc/intel/skylake/skl.c | 119 ++++++- sound/soc/intel/skylake/skl.h | 12 +- 19 files changed, 1115 insertions(+), 49 deletions(-) create mode 100644 sound/soc/codecs/hdac_hda.c create mode 100644 sound/soc/codecs/hdac_hda.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.c create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_generic.c -- 2.7.4

1 10

[alsa-devel] [asoc:for-next 32/53] sound/soc/intel/boards/cht_bsw_nau8824.c:137:36: sparse: incorrect type in argument 1 (different base types)
by kbuild test robot 01 Mar '18

01 Mar '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next head: 392b22b9bc76706334efdfe11d3747c9ef8962bf commit: 77348ef86e9b9fdab2fbb059b8e00c80adfa98ca [32/53] Merge remote-tracking branches 'asoc/topic/msm8916-wcd-digital', 'asoc/topic/nau8540', 'asoc/topic/nau8810' and 'asoc/topic/nau8824' into asoc-next reproduce: # apt-get install sparse git checkout 77348ef86e9b9fdab2fbb059b8e00c80adfa98ca make ARCH=x86_64 allmodconfig make C=1 CF=-D__CHECK_ENDIAN__ sparse warnings: (new ones prefixed by >>) >> sound/soc/intel/boards/cht_bsw_nau8824.c:137:36: sparse: incorrect type in argument 1 (different base types) @@ expected struct snd_soc_component *component @@ got ct snd_soc_component *component @@ sound/soc/intel/boards/cht_bsw_nau8824.c:137:36: expected struct snd_soc_component *component sound/soc/intel/boards/cht_bsw_nau8824.c:137:36: got struct snd_soc_codec *codec sound/soc/intel/boards/cht_bsw_nau8824.c: In function 'cht_codec_init': sound/soc/intel/boards/cht_bsw_nau8824.c:137:29: error: passing argument 1 of 'nau8824_enable_jack_detect' from incompatible pointer type [-Werror=incompatible-pointer-types] nau8824_enable_jack_detect(codec, jack); ^~~~~ In file included from sound/soc/intel/boards/cht_bsw_nau8824.c:31:0: sound/soc/intel/boards/../../codecs/nau8824.h:474:5: note: expected 'struct snd_soc_component *' but argument is of type 'struct snd_soc_codec *' int nau8824_enable_jack_detect(struct snd_soc_component *component, ^~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +137 sound/soc/intel/boards/cht_bsw_nau8824.c 5b00ce63 John Hsu 2018-02-06 101 5b00ce63 John Hsu 2018-02-06 102 static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) 5b00ce63 John Hsu 2018-02-06 103 { 5b00ce63 John Hsu 2018-02-06 104 struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); 5b00ce63 John Hsu 2018-02-06 105 struct snd_soc_jack *jack = &ctx->jack; 5b00ce63 John Hsu 2018-02-06 106 struct snd_soc_codec *codec = runtime->codec; 5b00ce63 John Hsu 2018-02-06 107 struct snd_soc_dai *codec_dai = runtime->codec_dai; 5b00ce63 John Hsu 2018-02-06 108 int ret, jack_type; 5b00ce63 John Hsu 2018-02-06 109 5b00ce63 John Hsu 2018-02-06 110 /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ 5b00ce63 John Hsu 2018-02-06 111 ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xf, 0x1, 4, 24); 5b00ce63 John Hsu 2018-02-06 112 if (ret < 0) { 5b00ce63 John Hsu 2018-02-06 113 dev_err(runtime->dev, "can't set codec TDM slot %d\n", ret); 5b00ce63 John Hsu 2018-02-06 114 return ret; 5b00ce63 John Hsu 2018-02-06 115 } 5b00ce63 John Hsu 2018-02-06 116 5b00ce63 John Hsu 2018-02-06 117 /* NAU88L24 supports 4 butons headset detection 5b00ce63 John Hsu 2018-02-06 118 * KEY_MEDIA 5b00ce63 John Hsu 2018-02-06 119 * KEY_VOICECOMMAND 5b00ce63 John Hsu 2018-02-06 120 * KEY_VOLUMEUP 5b00ce63 John Hsu 2018-02-06 121 * KEY_VOLUMEDOWN 5b00ce63 John Hsu 2018-02-06 122 */ 5b00ce63 John Hsu 2018-02-06 123 jack_type = SND_JACK_HEADPHONE | SND_JACK_BTN_0 | SND_JACK_BTN_1 | 5b00ce63 John Hsu 2018-02-06 124 SND_JACK_BTN_2 | SND_JACK_BTN_3; 5b00ce63 John Hsu 2018-02-06 125 ret = snd_soc_card_jack_new(runtime->card, "Headset", jack_type, jack, 5b00ce63 John Hsu 2018-02-06 126 cht_bsw_jack_pins, ARRAY_SIZE(cht_bsw_jack_pins)); 5b00ce63 John Hsu 2018-02-06 127 if (ret) { 5b00ce63 John Hsu 2018-02-06 128 dev_err(runtime->dev, 5b00ce63 John Hsu 2018-02-06 129 "Headset Jack creation failed %d\n", ret); 5b00ce63 John Hsu 2018-02-06 130 return ret; 5b00ce63 John Hsu 2018-02-06 131 } 5b00ce63 John Hsu 2018-02-06 132 snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA); 5b00ce63 John Hsu 2018-02-06 133 snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); 5b00ce63 John Hsu 2018-02-06 134 snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); 5b00ce63 John Hsu 2018-02-06 135 snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); 5b00ce63 John Hsu 2018-02-06 136 5b00ce63 John Hsu 2018-02-06 @137 nau8824_enable_jack_detect(codec, jack); 5b00ce63 John Hsu 2018-02-06 138 5b00ce63 John Hsu 2018-02-06 139 return ret; 5b00ce63 John Hsu 2018-02-06 140 } 5b00ce63 John Hsu 2018-02-06 141 :::::: The code at line 137 was first introduced by commit :::::: 5b00ce63e07fac692400db80d3e1fbd1f1f65701 ASoC: Intel: add nau8824 sound card :::::: TO: John Hsu <KCHSU0(a)nuvoton.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH v2] ASoC: max9867: Improve error logging
by Ladislav Michl 01 Mar '18

01 Mar '18

Tell user what are clock rate limits and reindent log messages. Signed-off-by: Ladislav Michl <ladis(a)linux-mips.org> --- Changes: - v2: Rebase against current branch sound/soc/codecs/max9867.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index 6b128dd6c5dd..b2a613e54fc7 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -291,7 +291,9 @@ static int max9867_set_dai_sysclk(struct snd_soc_dai *codec_dai, value |= MAX9867_PSCLK_40_60; max9867->pclk = freq/4; } else { - pr_err("bad clock frequency %d", freq); + dev_err(codec->dev, + "Invalid clock frequency %uHz (required 10-60MHz)\n", + freq); return -EINVAL; } value = value << MAX9867_PSCLK_SHIFT; @@ -476,8 +478,7 @@ static int max9867_i2c_probe(struct i2c_client *i2c, max9867->regmap = devm_regmap_init_i2c(i2c, &max9867_regmap); if (IS_ERR(max9867->regmap)) { ret = PTR_ERR(max9867->regmap); - dev_err(&i2c->dev, - "Failed to allocate regmap: %d\n", ret); + dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret); return ret; } ret = regmap_read(max9867->regmap, -- 2.16.2

1 0

[alsa-devel] [asoc:topic/max9867 2/4] sound/soc/codecs/max9867.c:294:11: error: 'component' undeclared; did you mean 'complete'?
by kbuild test robot 01 Mar '18

01 Mar '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/max9867 head: 79e139744508105bd749300f364563934bff23f2 commit: 8b9c716aada77e72e2fe82320aba5a95b75ca400 [2/4] ASoC: max9867: Improve error logging config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: git checkout 8b9c716aada77e72e2fe82320aba5a95b75ca400 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): sound/soc/codecs/max9867.c: In function 'max9867_set_dai_sysclk': >> sound/soc/codecs/max9867.c:294:11: error: 'component' undeclared (first use in this function); did you mean 'complete'? dev_err(component->dev, ^~~~~~~~~ complete sound/soc/codecs/max9867.c:294:11: note: each undeclared identifier is reported only once for each function it appears in vim +294 sound/soc/codecs/max9867.c 275 276 static int max9867_set_dai_sysclk(struct snd_soc_dai *codec_dai, 277 int clk_id, unsigned int freq, int dir) 278 { 279 struct snd_soc_codec *codec = codec_dai->codec; 280 struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); 281 int value = 0; 282 283 /* Set the prescaler based on the master clock frequency*/ 284 if (freq >= 10000000 && freq <= 20000000) { 285 value |= MAX9867_PSCLK_10_20; 286 max9867->pclk = freq; 287 } else if (freq >= 20000000 && freq <= 40000000) { 288 value |= MAX9867_PSCLK_20_40; 289 max9867->pclk = freq/2; 290 } else if (freq >= 40000000 && freq <= 60000000) { 291 value |= MAX9867_PSCLK_40_60; 292 max9867->pclk = freq/4; 293 } else { > 294 dev_err(component->dev, 295 "Invalid clock frequency %uHz (required 10-60MHz)\n", 296 freq); 297 return -EINVAL; 298 } 299 value = value << MAX9867_PSCLK_SHIFT; 300 max9867->sysclk = freq; 301 /* exact integer mode is not supported */ 302 value &= ~MAX9867_FREQ_MASK; 303 regmap_update_bits(max9867->regmap, MAX9867_SYSCLK, 304 MAX9867_PSCLK_MASK, value); 305 return 0; 306 } 307 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

3 4

[alsa-devel] [asoc:for-next 32/53] sound/soc/intel/boards/cht_bsw_nau8824.c:137:29: error: passing argument 1 of 'nau8824_enable_jack_detect' from incompatible pointer type
by kbuild test robot 01 Mar '18

01 Mar '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next head: 90d3c54575fc6488e912870c3d1a8b4af6a5a7b7 commit: bdc6f82ed1a68bdedea3c899e4ac35c88e02e63a [32/53] Merge remote-tracking branches 'asoc/topic/msm8916-wcd-digital', 'asoc/topic/nau8540', 'asoc/topic/nau8810' and 'asoc/topic/nau8824' into asoc-next config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: git checkout bdc6f82ed1a68bdedea3c899e4ac35c88e02e63a # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): sound/soc/intel/boards/cht_bsw_nau8824.c: In function 'cht_codec_init': >> sound/soc/intel/boards/cht_bsw_nau8824.c:137:29: error: passing argument 1 of 'nau8824_enable_jack_detect' from incompatible pointer type [-Werror=incompatible-pointer-types] nau8824_enable_jack_detect(codec, jack); ^~~~~ In file included from sound/soc/intel/boards/cht_bsw_nau8824.c:31:0: sound/soc/intel/boards/../../codecs/nau8824.h:474:5: note: expected 'struct snd_soc_component *' but argument is of type 'struct snd_soc_codec *' int nau8824_enable_jack_detect(struct snd_soc_component *component, ^~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/nau8824_enable_jack_detect +137 sound/soc/intel/boards/cht_bsw_nau8824.c 5b00ce63 John Hsu 2018-02-06 101 5b00ce63 John Hsu 2018-02-06 102 static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) 5b00ce63 John Hsu 2018-02-06 103 { 5b00ce63 John Hsu 2018-02-06 104 struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); 5b00ce63 John Hsu 2018-02-06 105 struct snd_soc_jack *jack = &ctx->jack; 5b00ce63 John Hsu 2018-02-06 106 struct snd_soc_codec *codec = runtime->codec; 5b00ce63 John Hsu 2018-02-06 107 struct snd_soc_dai *codec_dai = runtime->codec_dai; 5b00ce63 John Hsu 2018-02-06 108 int ret, jack_type; 5b00ce63 John Hsu 2018-02-06 109 5b00ce63 John Hsu 2018-02-06 110 /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ 5b00ce63 John Hsu 2018-02-06 111 ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xf, 0x1, 4, 24); 5b00ce63 John Hsu 2018-02-06 112 if (ret < 0) { 5b00ce63 John Hsu 2018-02-06 113 dev_err(runtime->dev, "can't set codec TDM slot %d\n", ret); 5b00ce63 John Hsu 2018-02-06 114 return ret; 5b00ce63 John Hsu 2018-02-06 115 } 5b00ce63 John Hsu 2018-02-06 116 5b00ce63 John Hsu 2018-02-06 117 /* NAU88L24 supports 4 butons headset detection 5b00ce63 John Hsu 2018-02-06 118 * KEY_MEDIA 5b00ce63 John Hsu 2018-02-06 119 * KEY_VOICECOMMAND 5b00ce63 John Hsu 2018-02-06 120 * KEY_VOLUMEUP 5b00ce63 John Hsu 2018-02-06 121 * KEY_VOLUMEDOWN 5b00ce63 John Hsu 2018-02-06 122 */ 5b00ce63 John Hsu 2018-02-06 123 jack_type = SND_JACK_HEADPHONE | SND_JACK_BTN_0 | SND_JACK_BTN_1 | 5b00ce63 John Hsu 2018-02-06 124 SND_JACK_BTN_2 | SND_JACK_BTN_3; 5b00ce63 John Hsu 2018-02-06 125 ret = snd_soc_card_jack_new(runtime->card, "Headset", jack_type, jack, 5b00ce63 John Hsu 2018-02-06 126 cht_bsw_jack_pins, ARRAY_SIZE(cht_bsw_jack_pins)); 5b00ce63 John Hsu 2018-02-06 127 if (ret) { 5b00ce63 John Hsu 2018-02-06 128 dev_err(runtime->dev, 5b00ce63 John Hsu 2018-02-06 129 "Headset Jack creation failed %d\n", ret); 5b00ce63 John Hsu 2018-02-06 130 return ret; 5b00ce63 John Hsu 2018-02-06 131 } 5b00ce63 John Hsu 2018-02-06 132 snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA); 5b00ce63 John Hsu 2018-02-06 133 snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); 5b00ce63 John Hsu 2018-02-06 134 snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); 5b00ce63 John Hsu 2018-02-06 135 snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); 5b00ce63 John Hsu 2018-02-06 136 5b00ce63 John Hsu 2018-02-06 @137 nau8824_enable_jack_detect(codec, jack); 5b00ce63 John Hsu 2018-02-06 138 5b00ce63 John Hsu 2018-02-06 139 return ret; 5b00ce63 John Hsu 2018-02-06 140 } 5b00ce63 John Hsu 2018-02-06 141 :::::: The code at line 137 was first introduced by commit :::::: 5b00ce63e07fac692400db80d3e1fbd1f1f65701 ASoC: Intel: add nau8824 sound card :::::: TO: John Hsu <KCHSU0(a)nuvoton.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] Applied "ASoC: rt5514: Fix rt5514_spi_burst_read() buffer passing" to the asoc tree
by Mark Brown 01 Mar '18

01 Mar '18

The patch ASoC: rt5514: Fix rt5514_spi_burst_read() buffer passing 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 >From 29838a5c1e77ed93d41fb9837390e243b9b73518 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert(a)linux-m68k.org> Date: Tue, 30 Jan 2018 14:19:42 +0100 Subject: [PATCH] ASoC: rt5514: Fix rt5514_spi_burst_read() buffer passing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rt5514_dsp_voice_wake_up_put() passes "(u8 *)&buf" to rt5514_spi_burst_read(), where the cast is needed to silence a compiler warning: sound/soc/codecs/rt5514.c: In function ‘rt5514_dsp_voice_wake_up_put’: sound/soc/codecs/rt5514.c:357: warning: passing argument 2 of ‘rt5514_spi_burst_read’ from incompatible pointer type However, as the variable is declared as an array ("u8 buf[8]"), the function should just pass "buf" instead. Fixes: fc9cab05837639ce ("ASoC: rt5514: The DSP clock can be calibrated by the other clock source") Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/rt5514.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index 2d79571098ac..b358704ee19c 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c @@ -353,8 +353,7 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol, msleep(20); #if IS_ENABLED(CONFIG_SND_SOC_RT5514_SPI) rt5514_spi_burst_read(RT5514_PLL3_CALIB_CTRL6 | - RT5514_DSP_MAPPING, - (u8 *)&buf, sizeof(buf)); + RT5514_DSP_MAPPING, buf, sizeof(buf)); #else dev_err(component->dev, "There is no SPI driver for" " loading the firmware\n"); -- 2.16.2

1 0

[alsa-devel] Applied "ASoC: rt5514: Fix uninitialized calibration value" to the asoc tree
by Mark Brown 01 Mar '18

01 Mar '18

The patch ASoC: rt5514: Fix uninitialized calibration value 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 >From 890861aa85043cc9d99a01e1bd26883722e95243 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert(a)linux-m68k.org> Date: Tue, 30 Jan 2018 14:19:43 +0100 Subject: [PATCH] ASoC: rt5514: Fix uninitialized calibration value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With gcc-4.1.2, if CONFIG_SND_SOC_RT5514_SPI is not set: sound/soc/codecs/rt5514.c: In function ‘rt5514_dsp_voice_wake_up_put’: sound/soc/codecs/rt5514.c:363: warning: ‘buf[0]’ is used uninitialized in this function sound/soc/codecs/rt5514.c:363: warning: ‘buf[1]’ is used uninitialized in this function sound/soc/codecs/rt5514.c:363: warning: ‘buf[2]’ is used uninitialized in this function sound/soc/codecs/rt5514.c:363: warning: ‘buf[3]’ is used uninitialized in this function Fix this by initializing the buffer with zeroes, to avoid random bits being written to the calibration register later. Fixes: fc9cab05837639ce ("ASoC: rt5514: The DSP clock can be calibrated by the other clock source") Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/rt5514.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index b358704ee19c..e8a66b03faab 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c @@ -357,6 +357,7 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol, #else dev_err(component->dev, "There is no SPI driver for" " loading the firmware\n"); + memset(buf, 0, sizeof(buf)); #endif rt5514->pll3_cal_value = buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24; -- 2.16.2

1 0