From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omzsmtpe03.verizonbusiness.com ([199.249.25.208]:15005 "EHLO omzsmtpe03.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753029AbdDDTcj (ORCPT ); Tue, 4 Apr 2017 15:32:39 -0400 From: alexander.levin@verizon.com To: "gregkh@linuxfoundation.org" CC: "stable@vger.kernel.org" Subject: [PATCH for 4.9 05/98] ASoC: Intel: bytct_rt5640: change default capture settings Date: Tue, 4 Apr 2017 19:32:04 +0000 Message-ID: <20170404193158.19041-6-alexander.levin@verizon.com> References: <20170404193158.19041-1-alexander.levin@verizon.com> In-Reply-To: <20170404193158.19041-1-alexander.levin@verizon.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Pierre-Louis Bossart [ Upstream commit bf46241bee7bc3ec28703796f4fbd56085055fca ] Most Baytrail-CR devices use analog differential microphones, modify capture default to avoid DMI quirks. Keep digital mics for all other configurations. Signed-off-by: Pierre-Louis Bossart Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/boards/bytcr_rt5640.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards= /bytcr_rt5640.c index bff77a1..0d9811c 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -57,9 +57,7 @@ struct byt_rt5640_private { struct clk *mclk; }; =20 -static unsigned long byt_rt5640_quirk =3D BYT_RT5640_DMIC1_MAP | - BYT_RT5640_DMIC_EN | - BYT_RT5640_MCLK_EN; +static unsigned long byt_rt5640_quirk =3D BYT_RT5640_MCLK_EN; =20 static void log_quirks(struct device *dev) { @@ -738,6 +736,13 @@ static int snd_byt_rt5640_mc_probe(struct platform_dev= ice *pdev) if (res_info->acpi_ipc_irq_index =3D=3D 0) { byt_rt5640_quirk |=3D BYT_RT5640_SSP0_AIF2; } + + /* change defaults for Baytrail-CR capture */ + byt_rt5640_quirk |=3D BYT_RT5640_IN1_MAP; + byt_rt5640_quirk |=3D BYT_RT5640_DIFF_MIC; + } else { + byt_rt5640_quirk |=3D (BYT_RT5640_DMIC1_MAP | + BYT_RT5640_DMIC_EN); } =20 /* check quirks before creating card */ --=20 2.9.3