From patchwork Thu Sep 11 23:52:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatol Pomozov X-Patchwork-Id: 4891171 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7DA51BEEA5 for ; Thu, 11 Sep 2014 23:53:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0FA8620254 for ; Thu, 11 Sep 2014 23:53:16 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id BB8692022A for ; Thu, 11 Sep 2014 23:53:11 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 13131265053; Fri, 12 Sep 2014 01:53:08 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 62F56265068; Fri, 12 Sep 2014 01:52:58 +0200 (CEST) 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 B9C0E26568F; Fri, 12 Sep 2014 01:52:56 +0200 (CEST) Received: from mail-ob0-f201.google.com (mail-ob0-f201.google.com [209.85.214.201]) by alsa0.perex.cz (Postfix) with ESMTP id 0A5B5265053 for ; Fri, 12 Sep 2014 01:52:47 +0200 (CEST) Received: by mail-ob0-f201.google.com with SMTP id m8so467248obr.4 for ; Thu, 11 Sep 2014 16:52:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=r1Gnm4ZZeJyr3tit9VJAiUZSbGTGG2RUqDCU9gzniMc=; b=acrmzA8PwC6nZF41bHCLADV/BuGY/V4KhuhBR6WlC+MtTH+jUu3HAzQMDhu/Kdw+VI Jkj7U/SbPvFB2YuzcWxFTy30GL4WVoKRBPc/UR717HWFfXmrI/rOw4On4rwfRHsFVTHy 9rhkXCUtKZm5klUvWaoddJpEcDNCwvG2+nDZdKhGVQq1+hxgly9MZCNjFTpcJ3MaI3JM 38TSoLmx7JQ8aaz+N7pU6QC4UfxhhTbbTQUDbqPMymVkIC1mhN6DlpfjleMugmedYvV7 B+UpsvuZvsqEFaRZHTOsmtUD1MVoCF8rxw9gtZcGPyPngtlDQMvcH6SsOf7BvFXSYoU+ mqdg== X-Gm-Message-State: ALoCoQmbzN86UjoKHBI0dAiKb7FDaC3vw5r7b6K48kF8whuYdjScwlOrvlxbZPTxQqq3eXiH2BhiDbv2FFCgY6DuP0ydPe/80sk7JW8x6DWbV4e9hPmXlrrZXSRZOaHH//NEJQR8/zXyc3TsM9Qv9kGvb+eLoRGxdI1cEk6rQBc1dT665kXzr3E= X-Received: by 10.182.102.34 with SMTP id fl2mr2518681obb.16.1410479566182; Thu, 11 Sep 2014 16:52:46 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id m14si110523yhm.7.2014.09.11.16.52.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Sep 2014 16:52:46 -0700 (PDT) Received: from anatol.mtv.corp.google.com ([172.22.64.197]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id gHl3eMt6.1; Thu, 11 Sep 2014 16:52:46 -0700 Received: by anatol.mtv.corp.google.com (Postfix, from userid 67983) id 56430100397; Thu, 11 Sep 2014 16:52:45 -0700 (PDT) From: Anatol Pomozov To: alsa-devel@alsa-project.org Date: Thu, 11 Sep 2014 16:52:39 -0700 Message-Id: <1410479559-3781-1-git-send-email-anatol.pomozov@gmail.com> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 Cc: oder_chiou@realtek.com, bardliao@realtek.com, Anatol Pomozov , broonie@linaro.org Subject: [alsa-devel] [PATCH] ASoC: rt5677: Add sidetone controls 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Anatol Pomozov --- sound/soc/codecs/rt5677.c | 7 +++++++ sound/soc/codecs/rt5677.h | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index cf41e89..4972b5b 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -541,6 +541,7 @@ static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0); static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0); static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0); static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0); +static const DECLARE_TLV_DB_SCALE(st_vol_tlv, -4650, 150, 0); /* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */ static unsigned int bst_tlv[] = { @@ -577,6 +578,12 @@ static const struct snd_kcontrol_new rt5677_snd_controls[] = { SOC_SINGLE_TLV("IN1 Boost", RT5677_IN1, RT5677_BST_SFT1, 8, 0, bst_tlv), SOC_SINGLE_TLV("IN2 Boost", RT5677_IN1, RT5677_BST_SFT2, 8, 0, bst_tlv), + /* Sidetone Control */ + SOC_SINGLE("Sidetone Switch", RT5677_SIDETONE_CTRL, + RT5677_ST_EN_SFT, 1, 0), + SOC_SINGLE_TLV("Sidetone Volume", RT5677_SIDETONE_CTRL, + RT5677_ST_VOL_SFT, 31, 0, st_vol_tlv), + /* ADC Digital Volume Control */ SOC_DOUBLE("ADC1 Capture Switch", RT5677_STO1_ADC_DIG_VOL, RT5677_L_MUTE_SFT, RT5677_R_MUTE_SFT, 1, 1), diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h index 3c1b4dc..f28911d 100644 --- a/sound/soc/codecs/rt5677.h +++ b/sound/soc/codecs/rt5677.h @@ -382,6 +382,10 @@ #define RT5677_ST_SEL_SFT 9 #define RT5677_ST_EN (0x1 << 6) #define RT5677_ST_EN_SFT 6 +#define RT5677_ST_GAIN (0x1 << 5) +#define RT5677_ST_GAIN_SFT 5 +#define RT5677_ST_VOL_MASK (0x1f << 0) +#define RT5677_ST_VOL_SFT 0 /* Analog DAC1/2/3 Source Control (0x15) */ #define RT5677_ANA_DAC3_SRC_SEL_MASK (0x3 << 4)