| From 4c3ade2f4db50dec265397c23f308e530de4937f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 27 Oct 2021 10:18:16 +0800 |
| Subject: ASoC: Intel: sof_sdw: fix jack detection on HP Spectre x360 |
| convertible |
| |
| From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> |
| |
| [ Upstream commit 0527b19fa4f390a6054612e1fa1dd4f8efc96739 ] |
| |
| Tests on device show the JD2 mode does not work at all, the 'Headphone |
| Jack' and 'Headset Mic Jack' are shown as 'on' always. |
| |
| JD1 seems to be the better option, with at least a change between the |
| two cases. |
| |
| Jack not plugged-in: |
| [root@fedora ~]# amixer -Dhw:0 cget numid=12 |
| numid=12,iface=CARD,name='Headphone Jack' |
| ; type=BOOLEAN,access=r-------,values=1 |
| : values=off |
| [root@fedora ~]# amixer -Dhw:0 cget numid=13 |
| numid=13,iface=CARD,name='Headset Mic Jack' |
| ; type=BOOLEAN,access=r-------,values=1 |
| : values=off |
| |
| Jack plugged-in: |
| [root@fedora ~]# amixer -Dhw:0 cget numid=13 |
| numid=13,iface=CARD,name='Headset Mic Jack' |
| ; type=BOOLEAN,access=r-------,values=1 |
| : values=on |
| [root@fedora ~]# amixer -Dhw:0 cget numid=13 |
| numid=13,iface=CARD,name='Headset Mic Jack' |
| ; type=BOOLEAN,access=r-------,values=1 |
| : values=on |
| |
| The 'Headset Mic Jack' is updated with a delay which seems normal with |
| additional calibration needed. |
| |
| Fixes: d92e279dee56 ('ASoC: Intel: sof_sdw: add quirk for HP Spectre x360 convertible') |
| Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> |
| Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> |
| Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> |
| Link: https://lore.kernel.org/r/20211027021824.24776-3-yung-chuan.liao@linux.intel.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/intel/boards/sof_sdw.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c |
| index 77219c3f8766c..54eefaff62a7e 100644 |
| --- a/sound/soc/intel/boards/sof_sdw.c |
| +++ b/sound/soc/intel/boards/sof_sdw.c |
| @@ -188,7 +188,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { |
| }, |
| .driver_data = (void *)(SOF_SDW_TGL_HDMI | |
| SOF_SDW_PCH_DMIC | |
| - RT711_JD2), |
| + RT711_JD1), |
| }, |
| { |
| /* NUC15 'Bishop County' LAPBC510 and LAPBC710 skews */ |
| -- |
| 2.34.1 |
| |
