From patchwork Thu Jan 8 02:31:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oder Chiou X-Patchwork-Id: 5590261 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 26C0C9F357 for ; Thu, 8 Jan 2015 02:31:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B113A20389 for ; Thu, 8 Jan 2015 02:31:43 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 3D7DC20375 for ; Thu, 8 Jan 2015 02:31:42 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 29A7A265317; Thu, 8 Jan 2015 03:31:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 43F5C2606CB; Thu, 8 Jan 2015 03:31:34 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5B56E2606CB; Thu, 8 Jan 2015 03:31:32 +0100 (CET) Received: from rtits2.realtek.com (rtits2.realtek.com [60.250.210.242]) by alsa0.perex.cz (Postfix) with ESMTP id C366C2606C9 for ; Thu, 8 Jan 2015 03:31:24 +0100 (CET) Authenticated-By: X-SpamFilter-By: BOX Solutions SpamTrap 5.52 with qID t082VCtF011986, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtitcas12.realtek.com.tw[172.21.6.16]) by rtits2.realtek.com (8.14.9/2.40/5.64) with ESMTP id t082VCtF011986 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Thu, 8 Jan 2015 10:31:12 +0800 Received: from sw-server.rtdomain (172.21.81.164) by RTITCAS12.realtek.com.tw (172.21.6.16) with Microsoft SMTP Server id 14.3.181.6; Thu, 8 Jan 2015 10:31:13 +0800 From: Oder Chiou To: , Date: Thu, 8 Jan 2015 10:31:07 +0800 Message-ID: <1420684267-19211-3-git-send-email-oder_chiou@realtek.com> X-Mailer: git-send-email 1.8.1.1.439.g50a6b54 In-Reply-To: <1420684267-19211-1-git-send-email-oder_chiou@realtek.com> References: <1420684267-19211-1-git-send-email-oder_chiou@realtek.com> MIME-Version: 1.0 X-Originating-IP: [172.21.81.164] Cc: Oder Chiou , alsa-devel@alsa-project.org, yang.a.fang@intel.com, john.lin@realtek.com, bardliao@realtek.com, flove@realtek.com Subject: [alsa-devel] [PATCH 3/3] ASoC: rt5677: Add the specific TDM setting for Intel platform. X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The patch adds the specific TDM setting for Intel platform in the platform data. It enables the TDM1's capbility that can receive the 100FS data. Signed-off-by: Oder Chiou --- include/sound/rt5677.h | 3 +++ sound/soc/codecs/rt5677.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/sound/rt5677.h b/include/sound/rt5677.h index a620704..1137183 100644 --- a/include/sound/rt5677.h +++ b/include/sound/rt5677.h @@ -40,6 +40,9 @@ struct rt5677_platform_data { /* Set MICBIAS1 VDD 1v8 or 3v3 */ bool micbias1_vdd_3v3; + + /* Set TDM mode for Intel */ + bool tdm_for_intel; }; #endif diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 32c368c..b1c17b0 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -4427,7 +4427,7 @@ static int rt5677_probe(struct snd_soc_codec *codec) rt5677_set_bias_level(codec, SND_SOC_BIAS_OFF); - regmap_write(rt5677->regmap, RT5677_DIG_MISC, 0x0020); + regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x0020, 0x0020); regmap_write(rt5677->regmap, RT5677_PWR_DSP2, 0x0c00); for (i = 0; i < RT5677_GPIO_NUM; i++) @@ -4928,6 +4928,10 @@ static int rt5677_i2c_probe(struct i2c_client *i2c, RT5677_MICBIAS1_CTRL_VDD_MASK, RT5677_MICBIAS1_CTRL_VDD_3_3V); + if (rt5677->pdata.tdm_for_intel) + regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x8000, + 0x8000); + rt5677_init_gpio(i2c); rt5677_init_irq(i2c);