October 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [asoc:topic/intel 41/42] sound/soc/intel/boards/bytcr_rt5651.c:325:2: error: implicit declaration of function 'rt5651_set_jack_detect'
by kbuild test robot 30 Oct '17

30 Oct '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: 2fe30129b0a6a8ddf71c46c8fb4524cb89739bc0 commit: d9f8f9b2f3e2b95875cd59ae5c3276e4662e7513 [41/42] ASoC: intel: byt: Add headset jack config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout d9f8f9b2f3e2b95875cd59ae5c3276e4662e7513 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): sound/soc/intel/boards/bytcr_rt5651.c: In function 'byt_rt5651_init': >> sound/soc/intel/boards/bytcr_rt5651.c:325:2: error: implicit declaration of function 'rt5651_set_jack_detect' [-Werror=implicit-function-declaration] rt5651_set_jack_detect(codec, &priv->jack); ^~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/rt5651_set_jack_detect +325 sound/soc/intel/boards/bytcr_rt5651.c 255 256 static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) 257 { 258 struct snd_soc_card *card = runtime->card; 259 struct snd_soc_codec *codec = runtime->codec; 260 struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card); 261 const struct snd_soc_dapm_route *custom_map; 262 int num_routes; 263 int ret; 264 265 card->dapm.idle_bias_off = true; 266 267 switch (BYT_RT5651_MAP(byt_rt5651_quirk)) { 268 case BYT_RT5651_IN1_MAP: 269 custom_map = byt_rt5651_intmic_in1_map; 270 num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_map); 271 break; 272 case BYT_RT5651_IN2_MAP: 273 custom_map = byt_rt5651_intmic_in2_map; 274 num_routes = ARRAY_SIZE(byt_rt5651_intmic_in2_map); 275 break; 276 default: 277 custom_map = byt_rt5651_intmic_dmic_map; 278 num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map); 279 } 280 ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes); 281 if (ret) 282 return ret; 283 284 ret = snd_soc_add_card_controls(card, byt_rt5651_controls, 285 ARRAY_SIZE(byt_rt5651_controls)); 286 if (ret) { 287 dev_err(card->dev, "unable to add card controls\n"); 288 return ret; 289 } 290 snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone"); 291 snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker"); 292 293 if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) { 294 /* 295 * The firmware might enable the clock at 296 * boot (this information may or may not 297 * be reflected in the enable clock register). 298 * To change the rate we must disable the clock 299 * first to cover these cases. Due to common 300 * clock framework restrictions that do not allow 301 * to disable a clock that has not been enabled, 302 * we need to enable the clock first. 303 */ 304 ret = clk_prepare_enable(priv->mclk); 305 if (!ret) 306 clk_disable_unprepare(priv->mclk); 307 308 if (byt_rt5651_quirk & BYT_RT5651_MCLK_25MHZ) 309 ret = clk_set_rate(priv->mclk, 25000000); 310 else 311 ret = clk_set_rate(priv->mclk, 19200000); 312 313 if (ret) 314 dev_err(card->dev, "unable to set MCLK rate\n"); 315 } 316 317 ret = snd_soc_card_jack_new(runtime->card, "Headset", 318 SND_JACK_HEADSET, &priv->jack, 319 bytcr_jack_pins, ARRAY_SIZE(bytcr_jack_pins)); 320 if (ret) { 321 dev_err(runtime->dev, "Headset jack creation failed %d\n", ret); 322 return ret; 323 } 324 > 325 rt5651_set_jack_detect(codec, &priv->jack); 326 327 return ret; 328 } 329 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

3 2

[alsa-devel] timestamp update when no hw delta
by Henrik Eriksson 30 Oct '17

30 Oct '17

Hi I am looking into commit 3179f62001880e588e229db3006a59ad87b7792a ("ALSA: core: add .get_time_info"), which, if I understand the code correctly, changed the behaviour of timestamps. Before this change, snd_pcm_update_hw_ptr0() just returned if the no_delta_check showed that the hw_ptr had not changed. With this change it will update the timestamps before returning. Was this intended, and if so does anyone have any insights to why? The original behaviour to not update the timestamps when the hw position has not changed seems more correct to me, but I am new to this code. Regards, /henrik

2 2

[alsa-devel] [PATCH 0/3] ASoC: wm8741: Varios enhancements
by Sergej Sawazki 30 Oct '17

30 Oct '17

This patch series contains the following 3 patches for the WM8741 codec driver. 1) Adds digital mute callback. 2) Sets oversampling rate mode (OSR), required for sampling rates > 48kHz. 3) Sets MCLK/LRCLK sampling rate ratio (SR), avoids relying on auto-detection. Sergej Sawazki (3): ASoC: wm8741: Add digital mute callback ASoC: wm8741: Set OSR mode in hw_params() ASoC: wm8741: Set SR mode in hw_params() sound/soc/codecs/wm8741.c | 49 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) -- 2.7.4

3 15

[alsa-devel] [PATCH linux-next 1/1] ASoC: rsnd: ssiu: reset SSI_MODE register
by jiada_wang＠mentor.com 30 Oct '17

30 Oct '17

From: Jiada Wang <jiada_wang(a)mentor.com> register SSI_MODE is set when SSI works in TDM Extended or TDM (Ex-)Split mode, but it isn't reset after SSI stops. this will cause issue, if SSI starts to work in other modes which requie SSI_MODE to have different value. This patch resets SSI_MODE register in .stop callback, when last stream calls .stop. Fixes: 186fadc132f0 ("ASoC: rsnd: add TDM Extend Mode support") Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- sound/soc/sh/rcar/ssiu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 4d94875..eff9f3b 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -217,6 +217,8 @@ static int rsnd_ssiu_stop_gen2(struct rsnd_mod *mod, if (rsnd_ssi_multi_slaves_runtime(io)) rsnd_mod_write(mod, SSI_CONTROL, 0); + rsnd_mod_write(mod, SSI_MODE, 0); + return 0; } -- 1.7.9.5

3 3

[alsa-devel] [PATCH] sound: fix kernel-doc build warning
by Randy Dunlap 30 Oct '17

30 Oct '17

From: Randy Dunlap <rdunlap(a)infradead.org> Fix kernel-doc build error. A symbol that ends with an underscore character ('_') has special meaning in reST (reStructuredText), so add a '*' to prevent this error and to indicate that there are several of these values to choose from. ../sound/core/jack.c:312: ERROR: Unknown target name: "snd_jack_btn". Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org --- sound/core/jack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- lnx-414-rc7.orig/sound/core/jack.c +++ lnx-414-rc7/sound/core/jack.c @@ -310,7 +310,7 @@ EXPORT_SYMBOL(snd_jack_set_parent); * @type: Jack report type for this key * @keytype: Input layer key type to be reported * - * Map a SND_JACK_BTN_ button type to an input layer key, allowing + * Map a SND_JACK_BTN_* button type to an input layer key, allowing * reporting of keys on accessories via the jack abstraction. If no * mapping is provided but keys are enabled in the jack type then * BTN_n numeric buttons will be reported.

2 1

[alsa-devel] message size limit
by Jaroslav Kysela 29 Oct '17

29 Oct '17

Hello all, I increased the maximal message size for this alsa-devel list to 200kB (as we discussed with Takashi to allow bigger patches for review). Anyway, if you like to send something big, it's better to upload the data to a public place and provide only URL. Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

2 1

[alsa-devel] [PATCH RESEND 0/2] Enable TDM slot and fix SSP params for kabylake machine driver
by Harsha Priya 27 Oct '17

27 Oct '17

Hi Mark, These are resend of an already acked patch series. I posted it a few weeks ago but there has been update on the base branch. I want to resend these. Kindly review and merge. This patch series includes 2 patches for kabylake machine driver using max98927 and rt5663 codecs. The changes are: 1. Enable 4 tdm slots for IV feedback and 2 tdm slots for playback on max98927 2. Fix setting of SSP parameters to be based on FE and BE dai links. Harsha Priya (2): ASoC: Intel: Enable tdm slots for max98927 ASoC: Intel: Fix setting of SSP parameters in Kabylake machine driver sound/soc/intel/boards/kbl_rt5663_max98927.c | 67 +++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 7 deletions(-) -- 1.9.1

2 3

[alsa-devel] [PATCH] conf/ucm: rt5651: Fix HiFi file name
by Carlo Caione 26 Oct '17

26 Oct '17

From: Carlo Caione <carlo(a)endlessm.com> The conf HiFi file name is HiFi.conf, fix the name in the main configuration file. Signed-off-by: Carlo Caione <carlo(a)endlessm.com> --- src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf index 2dcc72cc..60798ce7 100644 --- a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf +++ b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf @@ -1,7 +1,7 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 SectionUseCase."HiFi" { - File "HiFi" + File "HiFi.conf" Comment "Play HiFi quality Music" } -- 2.14.2

2 1

[alsa-devel] [asoc:for-next 16/17] sound/soc/codecs/rt5651.c:1874:20: error: redefinition of 'rt5651_irq'
by kbuild test robot 26 Oct '17

26 Oct '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next head: 2708a8339e928912307fe5cd1ae66d959caa7279 commit: b16351eba5e00bd7957fb16b98a152e5425ceb74 [16/17] Merge remote-tracking branches 'asoc/topic/sgtl5000', 'asoc/topic/stm32', 'asoc/topic/tas571x', 'asoc/topic/tfa9879' and 'asoc/topic/ts3a277e' into asoc-next config: xtensa-allyesconfig (attached as .config) compiler: xtensa-linux-gcc (GCC) 4.9.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout b16351eba5e00bd7957fb16b98a152e5425ceb74 # save the attached .config to linux build tree make.cross ARCH=xtensa All error/warnings (new ones prefixed by >>): >> sound/soc/codecs/rt5651.c:1874:20: error: redefinition of 'rt5651_irq' static irqreturn_t rt5651_irq(int irq, void *data) ^ sound/soc/codecs/rt5651.c:1787:20: note: previous definition of 'rt5651_irq' was here static irqreturn_t rt5651_irq(int irq, void *data) ^ >> sound/soc/codecs/rt5651.c:1884:12: error: redefinition of 'rt5651_jack_detect' static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) ^ sound/soc/codecs/rt5651.c:1797:12: note: previous definition of 'rt5651_jack_detect' was here static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) ^ >> sound/soc/codecs/rt5651.c:1920:13: error: redefinition of 'rt5651_jack_detect_work' static void rt5651_jack_detect_work(struct work_struct *work) ^ sound/soc/codecs/rt5651.c:1833:13: note: previous definition of 'rt5651_jack_detect_work' was here static void rt5651_jack_detect_work(struct work_struct *work) ^ >> sound/soc/codecs/rt5651.c:1949:5: error: redefinition of 'rt5651_set_jack_detect' int rt5651_set_jack_detect(struct snd_soc_codec *codec, ^ sound/soc/codecs/rt5651.c:1862:5: note: previous definition of 'rt5651_set_jack_detect' was here int rt5651_set_jack_detect(struct snd_soc_codec *codec, ^ In file included from include/linux/linkage.h:6:0, from include/linux/kernel.h:6, from include/linux/list.h:8, from include/linux/module.h:9, from sound/soc/codecs/rt5651.c:12: >> include/linux/export.h:67:20: error: redefinition of '__kstrtab_rt5651_set_jack_detect' static const char __kstrtab_##sym[] \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ >> sound/soc/codecs/rt5651.c:1959:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:67:20: note: previous definition of '__kstrtab_rt5651_set_jack_detect' was here static const char __kstrtab_##sym[] \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc/codecs/rt5651.c:1872:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:70:36: error: redefinition of '__ksymtab_rt5651_set_jack_detect' static const struct kernel_symbol __ksymtab_##sym \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ >> sound/soc/codecs/rt5651.c:1959:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:70:36: note: previous definition of '__ksymtab_rt5651_set_jack_detect' was here static const struct kernel_symbol __ksymtab_##sym \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc/codecs/rt5651.c:1872:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ sound/soc/codecs/rt5651.c:1833:13: warning: 'rt5651_jack_detect_work' defined but not used [-Wunused-function] static void rt5651_jack_detect_work(struct work_struct *work) ^ -- sound/soc//codecs/rt5651.c:1874:20: error: redefinition of 'rt5651_irq' static irqreturn_t rt5651_irq(int irq, void *data) ^ sound/soc//codecs/rt5651.c:1787:20: note: previous definition of 'rt5651_irq' was here static irqreturn_t rt5651_irq(int irq, void *data) ^ sound/soc//codecs/rt5651.c:1884:12: error: redefinition of 'rt5651_jack_detect' static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) ^ sound/soc//codecs/rt5651.c:1797:12: note: previous definition of 'rt5651_jack_detect' was here static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) ^ sound/soc//codecs/rt5651.c:1920:13: error: redefinition of 'rt5651_jack_detect_work' static void rt5651_jack_detect_work(struct work_struct *work) ^ sound/soc//codecs/rt5651.c:1833:13: note: previous definition of 'rt5651_jack_detect_work' was here static void rt5651_jack_detect_work(struct work_struct *work) ^ sound/soc//codecs/rt5651.c:1949:5: error: redefinition of 'rt5651_set_jack_detect' int rt5651_set_jack_detect(struct snd_soc_codec *codec, ^ sound/soc//codecs/rt5651.c:1862:5: note: previous definition of 'rt5651_set_jack_detect' was here int rt5651_set_jack_detect(struct snd_soc_codec *codec, ^ In file included from include/linux/linkage.h:6:0, from include/linux/kernel.h:6, from include/linux/list.h:8, from include/linux/module.h:9, from sound/soc//codecs/rt5651.c:12: >> include/linux/export.h:67:20: error: redefinition of '__kstrtab_rt5651_set_jack_detect' static const char __kstrtab_##sym[] \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc//codecs/rt5651.c:1959:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:67:20: note: previous definition of '__kstrtab_rt5651_set_jack_detect' was here static const char __kstrtab_##sym[] \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc//codecs/rt5651.c:1872:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:70:36: error: redefinition of '__ksymtab_rt5651_set_jack_detect' static const struct kernel_symbol __ksymtab_##sym \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc//codecs/rt5651.c:1959:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:70:36: note: previous definition of '__ksymtab_rt5651_set_jack_detect' was here static const struct kernel_symbol __ksymtab_##sym \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc//codecs/rt5651.c:1872:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ sound/soc//codecs/rt5651.c:1833:13: warning: 'rt5651_jack_detect_work' defined but not used [-Wunused-function] static void rt5651_jack_detect_work(struct work_struct *work) ^ vim +/rt5651_irq +1874 sound/soc/codecs/rt5651.c b4435130 Carlo Caione 2017-10-20 1786 80bbe4a3 Carlo Caione 2017-10-20 @1787 static irqreturn_t rt5651_irq(int irq, void *data) 80bbe4a3 Carlo Caione 2017-10-20 1788 { 80bbe4a3 Carlo Caione 2017-10-20 1789 struct rt5651_priv *rt5651 = data; 80bbe4a3 Carlo Caione 2017-10-20 1790 80bbe4a3 Carlo Caione 2017-10-20 1791 queue_delayed_work(system_power_efficient_wq, 80bbe4a3 Carlo Caione 2017-10-20 1792 &rt5651->jack_detect_work, msecs_to_jiffies(250)); 80bbe4a3 Carlo Caione 2017-10-20 1793 80bbe4a3 Carlo Caione 2017-10-20 1794 return IRQ_HANDLED; 80bbe4a3 Carlo Caione 2017-10-20 1795 } 80bbe4a3 Carlo Caione 2017-10-20 1796 80bbe4a3 Carlo Caione 2017-10-20 @1797 static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) 80bbe4a3 Carlo Caione 2017-10-20 1798 { 80bbe4a3 Carlo Caione 2017-10-20 1799 struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); 80bbe4a3 Carlo Caione 2017-10-20 1800 int jack_type; 80bbe4a3 Carlo Caione 2017-10-20 1801 80bbe4a3 Carlo Caione 2017-10-20 1802 if (jack_insert) { 80bbe4a3 Carlo Caione 2017-10-20 1803 snd_soc_dapm_force_enable_pin(dapm, "LDO"); 80bbe4a3 Carlo Caione 2017-10-20 1804 snd_soc_dapm_sync(dapm); 80bbe4a3 Carlo Caione 2017-10-20 1805 80bbe4a3 Carlo Caione 2017-10-20 1806 snd_soc_update_bits(codec, RT5651_MICBIAS, 80bbe4a3 Carlo Caione 2017-10-20 1807 RT5651_MIC1_OVCD_MASK | 80bbe4a3 Carlo Caione 2017-10-20 1808 RT5651_MIC1_OVTH_MASK | 80bbe4a3 Carlo Caione 2017-10-20 1809 RT5651_PWR_CLK12M_MASK | 80bbe4a3 Carlo Caione 2017-10-20 1810 RT5651_PWR_MB_MASK, 80bbe4a3 Carlo Caione 2017-10-20 1811 RT5651_MIC1_OVCD_EN | 80bbe4a3 Carlo Caione 2017-10-20 1812 RT5651_MIC1_OVTH_600UA | b16351eb Mark Brown 2017-10-26 1813 RT5651_PWR_MB_PU | b16351eb Mark Brown 2017-10-26 1814 RT5651_PWR_CLK12M_PU); b16351eb Mark Brown 2017-10-26 1815 msleep(100); b16351eb Mark Brown 2017-10-26 1816 if (snd_soc_read(codec, RT5651_IRQ_CTRL2) & RT5651_MB1_OC_CLR) b16351eb Mark Brown 2017-10-26 1817 jack_type = SND_JACK_HEADPHONE; b16351eb Mark Brown 2017-10-26 1818 else b16351eb Mark Brown 2017-10-26 1819 jack_type = SND_JACK_HEADSET; b16351eb Mark Brown 2017-10-26 1820 snd_soc_update_bits(codec, RT5651_IRQ_CTRL2, b16351eb Mark Brown 2017-10-26 1821 RT5651_MB1_OC_CLR, 0); b16351eb Mark Brown 2017-10-26 1822 } else { /* jack out */ b16351eb Mark Brown 2017-10-26 1823 jack_type = 0; b16351eb Mark Brown 2017-10-26 1824 b16351eb Mark Brown 2017-10-26 1825 snd_soc_update_bits(codec, RT5651_MICBIAS, b16351eb Mark Brown 2017-10-26 1826 RT5651_MIC1_OVCD_MASK, b16351eb Mark Brown 2017-10-26 1827 RT5651_MIC1_OVCD_DIS); b16351eb Mark Brown 2017-10-26 1828 } b16351eb Mark Brown 2017-10-26 1829 b16351eb Mark Brown 2017-10-26 1830 return jack_type; b16351eb Mark Brown 2017-10-26 1831 } b16351eb Mark Brown 2017-10-26 1832 b16351eb Mark Brown 2017-10-26 1833 static void rt5651_jack_detect_work(struct work_struct *work) b16351eb Mark Brown 2017-10-26 1834 { b16351eb Mark Brown 2017-10-26 1835 struct rt5651_priv *rt5651 = b16351eb Mark Brown 2017-10-26 1836 container_of(work, struct rt5651_priv, jack_detect_work.work); b16351eb Mark Brown 2017-10-26 1837 b16351eb Mark Brown 2017-10-26 1838 int report, val = 0; b16351eb Mark Brown 2017-10-26 1839 b16351eb Mark Brown 2017-10-26 1840 if (!rt5651->codec) b16351eb Mark Brown 2017-10-26 1841 return; b16351eb Mark Brown 2017-10-26 1842 b16351eb Mark Brown 2017-10-26 1843 switch (rt5651->pdata.jd_src) { b16351eb Mark Brown 2017-10-26 1844 case RT5651_JD1_1: b16351eb Mark Brown 2017-10-26 1845 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x1000; b16351eb Mark Brown 2017-10-26 1846 break; b16351eb Mark Brown 2017-10-26 1847 case RT5651_JD1_2: b16351eb Mark Brown 2017-10-26 1848 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x2000; b16351eb Mark Brown 2017-10-26 1849 break; b16351eb Mark Brown 2017-10-26 1850 case RT5651_JD2: b16351eb Mark Brown 2017-10-26 1851 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x4000; b16351eb Mark Brown 2017-10-26 1852 break; b16351eb Mark Brown 2017-10-26 1853 default: b16351eb Mark Brown 2017-10-26 1854 break; b16351eb Mark Brown 2017-10-26 1855 } b16351eb Mark Brown 2017-10-26 1856 b16351eb Mark Brown 2017-10-26 1857 report = rt5651_jack_detect(rt5651->codec, !val); b16351eb Mark Brown 2017-10-26 1858 b16351eb Mark Brown 2017-10-26 1859 snd_soc_jack_report(rt5651->hp_jack, report, SND_JACK_HEADSET); b16351eb Mark Brown 2017-10-26 1860 } b16351eb Mark Brown 2017-10-26 1861 b16351eb Mark Brown 2017-10-26 1862 int rt5651_set_jack_detect(struct snd_soc_codec *codec, b16351eb Mark Brown 2017-10-26 1863 struct snd_soc_jack *hp_jack) b16351eb Mark Brown 2017-10-26 1864 { b16351eb Mark Brown 2017-10-26 1865 struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec); b16351eb Mark Brown 2017-10-26 1866 b16351eb Mark Brown 2017-10-26 1867 rt5651->hp_jack = hp_jack; b16351eb Mark Brown 2017-10-26 1868 rt5651_irq(0, rt5651); 3ae08dc0 Bard Liao 2015-12-23 1869 3ae08dc0 Bard Liao 2015-12-23 1870 return 0; 3ae08dc0 Bard Liao 2015-12-23 1871 } b16351eb Mark Brown 2017-10-26 1872 EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); 3ae08dc0 Bard Liao 2015-12-23 1873 60d5a1a4 Carlo Caione 2017-10-20 @1874 static irqreturn_t rt5651_irq(int irq, void *data) 60d5a1a4 Carlo Caione 2017-10-20 1875 { 60d5a1a4 Carlo Caione 2017-10-20 1876 struct rt5651_priv *rt5651 = data; 60d5a1a4 Carlo Caione 2017-10-20 1877 60d5a1a4 Carlo Caione 2017-10-20 1878 queue_delayed_work(system_power_efficient_wq, 60d5a1a4 Carlo Caione 2017-10-20 1879 &rt5651->jack_detect_work, msecs_to_jiffies(250)); 60d5a1a4 Carlo Caione 2017-10-20 1880 60d5a1a4 Carlo Caione 2017-10-20 1881 return IRQ_HANDLED; 60d5a1a4 Carlo Caione 2017-10-20 1882 } 60d5a1a4 Carlo Caione 2017-10-20 1883 60d5a1a4 Carlo Caione 2017-10-20 @1884 static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) 60d5a1a4 Carlo Caione 2017-10-20 1885 { 60d5a1a4 Carlo Caione 2017-10-20 1886 struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); 60d5a1a4 Carlo Caione 2017-10-20 1887 int jack_type; 60d5a1a4 Carlo Caione 2017-10-20 1888 60d5a1a4 Carlo Caione 2017-10-20 1889 if (jack_insert) { 60d5a1a4 Carlo Caione 2017-10-20 1890 snd_soc_dapm_force_enable_pin(dapm, "LDO"); 60d5a1a4 Carlo Caione 2017-10-20 1891 snd_soc_dapm_sync(dapm); 60d5a1a4 Carlo Caione 2017-10-20 1892 60d5a1a4 Carlo Caione 2017-10-20 1893 snd_soc_update_bits(codec, RT5651_MICBIAS, 60d5a1a4 Carlo Caione 2017-10-20 1894 RT5651_MIC1_OVCD_MASK | 60d5a1a4 Carlo Caione 2017-10-20 1895 RT5651_MIC1_OVTH_MASK | 60d5a1a4 Carlo Caione 2017-10-20 1896 RT5651_PWR_CLK12M_MASK | 60d5a1a4 Carlo Caione 2017-10-20 1897 RT5651_PWR_MB_MASK, 60d5a1a4 Carlo Caione 2017-10-20 1898 RT5651_MIC1_OVCD_EN | 60d5a1a4 Carlo Caione 2017-10-20 1899 RT5651_MIC1_OVTH_600UA | 80bbe4a3 Carlo Caione 2017-10-20 1900 RT5651_PWR_MB_PU | 80bbe4a3 Carlo Caione 2017-10-20 1901 RT5651_PWR_CLK12M_PU); 80bbe4a3 Carlo Caione 2017-10-20 1902 msleep(100); 80bbe4a3 Carlo Caione 2017-10-20 1903 if (snd_soc_read(codec, RT5651_IRQ_CTRL2) & RT5651_MB1_OC_CLR) 80bbe4a3 Carlo Caione 2017-10-20 1904 jack_type = SND_JACK_HEADPHONE; 80bbe4a3 Carlo Caione 2017-10-20 1905 else 80bbe4a3 Carlo Caione 2017-10-20 1906 jack_type = SND_JACK_HEADSET; 80bbe4a3 Carlo Caione 2017-10-20 1907 snd_soc_update_bits(codec, RT5651_IRQ_CTRL2, 80bbe4a3 Carlo Caione 2017-10-20 1908 RT5651_MB1_OC_CLR, 0); 80bbe4a3 Carlo Caione 2017-10-20 1909 } else { /* jack out */ 80bbe4a3 Carlo Caione 2017-10-20 1910 jack_type = 0; 80bbe4a3 Carlo Caione 2017-10-20 1911 80bbe4a3 Carlo Caione 2017-10-20 1912 snd_soc_update_bits(codec, RT5651_MICBIAS, 80bbe4a3 Carlo Caione 2017-10-20 1913 RT5651_MIC1_OVCD_MASK, 80bbe4a3 Carlo Caione 2017-10-20 1914 RT5651_MIC1_OVCD_DIS); 80bbe4a3 Carlo Caione 2017-10-20 1915 } 80bbe4a3 Carlo Caione 2017-10-20 1916 80bbe4a3 Carlo Caione 2017-10-20 1917 return jack_type; 80bbe4a3 Carlo Caione 2017-10-20 1918 } 80bbe4a3 Carlo Caione 2017-10-20 1919 80bbe4a3 Carlo Caione 2017-10-20 @1920 static void rt5651_jack_detect_work(struct work_struct *work) 80bbe4a3 Carlo Caione 2017-10-20 1921 { 80bbe4a3 Carlo Caione 2017-10-20 1922 struct rt5651_priv *rt5651 = 80bbe4a3 Carlo Caione 2017-10-20 1923 container_of(work, struct rt5651_priv, jack_detect_work.work); 80bbe4a3 Carlo Caione 2017-10-20 1924 80bbe4a3 Carlo Caione 2017-10-20 1925 int report, val = 0; 80bbe4a3 Carlo Caione 2017-10-20 1926 80bbe4a3 Carlo Caione 2017-10-20 1927 if (!rt5651->codec) 80bbe4a3 Carlo Caione 2017-10-20 1928 return; 80bbe4a3 Carlo Caione 2017-10-20 1929 80bbe4a3 Carlo Caione 2017-10-20 1930 switch (rt5651->pdata.jd_src) { 80bbe4a3 Carlo Caione 2017-10-20 1931 case RT5651_JD1_1: 80bbe4a3 Carlo Caione 2017-10-20 1932 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x1000; 80bbe4a3 Carlo Caione 2017-10-20 1933 break; 80bbe4a3 Carlo Caione 2017-10-20 1934 case RT5651_JD1_2: 80bbe4a3 Carlo Caione 2017-10-20 1935 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x2000; 80bbe4a3 Carlo Caione 2017-10-20 1936 break; 80bbe4a3 Carlo Caione 2017-10-20 1937 case RT5651_JD2: 80bbe4a3 Carlo Caione 2017-10-20 1938 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x4000; 80bbe4a3 Carlo Caione 2017-10-20 1939 break; 80bbe4a3 Carlo Caione 2017-10-20 1940 default: 80bbe4a3 Carlo Caione 2017-10-20 1941 break; 80bbe4a3 Carlo Caione 2017-10-20 1942 } 80bbe4a3 Carlo Caione 2017-10-20 1943 80bbe4a3 Carlo Caione 2017-10-20 1944 report = rt5651_jack_detect(rt5651->codec, !val); 80bbe4a3 Carlo Caione 2017-10-20 1945 80bbe4a3 Carlo Caione 2017-10-20 1946 snd_soc_jack_report(rt5651->hp_jack, report, SND_JACK_HEADSET); 80bbe4a3 Carlo Caione 2017-10-20 1947 } 80bbe4a3 Carlo Caione 2017-10-20 1948 80bbe4a3 Carlo Caione 2017-10-20 @1949 int rt5651_set_jack_detect(struct snd_soc_codec *codec, 80bbe4a3 Carlo Caione 2017-10-20 1950 struct snd_soc_jack *hp_jack) 80bbe4a3 Carlo Caione 2017-10-20 1951 { 80bbe4a3 Carlo Caione 2017-10-20 1952 struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec); 80bbe4a3 Carlo Caione 2017-10-20 1953 80bbe4a3 Carlo Caione 2017-10-20 1954 rt5651->hp_jack = hp_jack; 80bbe4a3 Carlo Caione 2017-10-20 1955 rt5651_irq(0, rt5651); 80bbe4a3 Carlo Caione 2017-10-20 1956 80bbe4a3 Carlo Caione 2017-10-20 1957 return 0; 80bbe4a3 Carlo Caione 2017-10-20 1958 } 80bbe4a3 Carlo Caione 2017-10-20 @1959 EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); 80bbe4a3 Carlo Caione 2017-10-20 1960 :::::: The code at line 1874 was first introduced by commit :::::: 60d5a1a47b9a8381c08d2263b11ac9c757c87746 ASoC: rt5651: Enable jack detection on JD* pins :::::: TO: Carlo Caione <carlo(a)endlessm.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 0/5] rt5651: Enable jack detection
by Carlo Caione 26 Oct '17

26 Oct '17

From: Carlo Caione <carlo(a)endlessm.com> Patchset to support jack detection for the rt5651 codec on the JD* pins and enable it on the KIANO cherry-trail laptop. Changelog: v2: - Added quirks for the KIANO laptop - Extended support to JD1_2 and JD2 pins - Reworked quirk logic in the codec driver - Codec driver can now differentiate between headphone and headset (thank you Bard Liao) Carlo Caione (5): ASoC: rt5651: Enable jack detection on JD* pins ASoC: intel: byt: Add headset jack ASoC: intel: byt: Enable IN2 map quirk for a KIANO laptop ASoC: rt5651: Rework quirk logic ASoC: rt5651: Enable JD1_1 quirk for KIANO laptopt include/sound/rt5651.h | 8 ++ sound/soc/codecs/rt5651.c | 215 +++++++++++++++++++++++++++++++++- sound/soc/codecs/rt5651.h | 4 + sound/soc/intel/boards/bytcr_rt5651.c | 31 +++++ 4 files changed, 252 insertions(+), 6 deletions(-) -- 2.14.2

2 11