From patchwork Mon Aug 14 22:06:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lori Hikichi X-Patchwork-Id: 9900309 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C59DF602BA for ; Mon, 14 Aug 2017 22:07:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B876C23F88 for ; Mon, 14 Aug 2017 22:07:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD4832874C; Mon, 14 Aug 2017 22:07:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2047623F88 for ; Mon, 14 Aug 2017 22:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=gncNGHqJPemPyNU/28qwxxazOTvuMCQV/NGHDeruzV8=; b=YB25BZgvuv5uX+UAXNntEwoufj Pphmg7FGPZZqlfu3dEkioo5oyq4Pug0SeJVUgUIazjJ8vJn2ebB9Ee+ow0Ah13rAsaedKaqlr4nXA h9Y/lXSp5AOn4ZiNOyKGXkfz2OTFeAw72aMpvUZfEIH+qnoVcPSu4G9TT+YbXjyjBJxFvvEXmV71q jji/u4ook0tJo+2u8vU2ItLKOcrCefRPEfnRlLhhuzhdRUBkoz61Z8AiyTBlXVqyoecL8v8FVmQQb PLVCM7wdW+UMl18G36gMDdIWKdNdKbUbB3HltOzgOlCqH0y4XHumx+/PTMpkHQN8ne6qYJabaWGkw xTLV1w/Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dhNWK-0006wa-Pm; Mon, 14 Aug 2017 22:07:36 +0000 Received: from mail-qt0-x22d.google.com ([2607:f8b0:400d:c0d::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dhNVZ-00063C-IP for linux-arm-kernel@lists.infradead.org; Mon, 14 Aug 2017 22:06:54 +0000 Received: by mail-qt0-x22d.google.com with SMTP id s6so59448706qtc.1 for ; Mon, 14 Aug 2017 15:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5m3WThREWjd1+RTnQ3QE2L2BoRWIXdz1rI+06Ma3Fqs=; b=Hfk16e9nCHx59xNReVe49hC0HR6SLbk5SThkZix1+0Mms9l8IXg7q/sAw/QqjLlGHM JI4gUYXzY0V6poHNEaPy5WXt0U1koQ+4K4Hzj7GtprMWxPHVBAMbqHtdDuNjeO45UsZa 6EjrSkXLl6fYXFCvoBSyQkZE0Q9vsMIzlmgEs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5m3WThREWjd1+RTnQ3QE2L2BoRWIXdz1rI+06Ma3Fqs=; b=nY0TM4P06cra1NTPScW/0dVjuHlsbNQvcPTI2avfgKnAlxDZjuZkJXjq++GaBHTKOW B0YhF6Iqv+BA08XAn0V03zCuT2dw/n6e/imMFa+bqvXzG5ILuIhme2i2bP92I9IzMTK+ qHLhspABFNmA83vLd5HFQ9H2J8YoHW8QuCIydW7Ph1Qa2eXhCgJ5hmly3qoIN8JhefQS s6z5jZ3UmzkN1KMUe2cMxv0RhbWtWX7+mMrRPl6yzmCo4xoSNZHC9B6YBIO8hKkeiIOH /bS9bXzRpk6aRAlCn3A42e/iaDww4YpVg3eY4nxBRLCJhAn6VUB2wk5jbICpJNkOfmlv 1jQg== X-Gm-Message-State: AHYfb5g4sJKkIVJPJ6mrNzgzLC0AUKiYoxPsSO/P3kCcXuX01NZwMwZX HlxbrdsniE0zunhs X-Received: by 10.237.61.123 with SMTP id h56mr34442449qtf.1.1502748388266; Mon, 14 Aug 2017 15:06:28 -0700 (PDT) Received: from lbrmn-ubu57.dhcp.broadcom.net ([192.19.224.250]) by smtp.gmail.com with ESMTPSA id v50sm5735105qtb.10.2017.08.14.15.06.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Aug 2017 15:06:27 -0700 (PDT) From: Lori Hikichi To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Jon Mason , bcm-kernel-feedback-list@broadcom.com, Jaroslav Kysela , Takashi Iwai Subject: [PATCH 4/9] ASoC: cygnus: Only enable MCLK pins when in use Date: Mon, 14 Aug 2017 15:06:52 -0700 Message-Id: <1502748417-26417-5-git-send-email-lori.hikichi@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1502748417-26417-1-git-send-email-lori.hikichi@broadcom.com> References: <1502748417-26417-1-git-send-email-lori.hikichi@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170814_150650_539708_97735982 X-CRM114-Status: GOOD ( 12.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Lori Hikichi , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The MCLK pins are now only enabled when they are in use. Signed-off-by: Lori Hikichi --- sound/soc/bcm/cygnus-ssp.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c index 00fd4dc..4c476ce 100644 --- a/sound/soc/bcm/cygnus-ssp.c +++ b/sound/soc/bcm/cygnus-ssp.c @@ -41,10 +41,10 @@ /* Begin register offset defines */ #define AUD_MISC_SEROUT_OE_REG_BASE 0x01c #define AUD_MISC_SEROUT_SPDIF_OE 12 -#define AUD_MISC_SEROUT_MCLK_OE 3 -#define AUD_MISC_SEROUT_LRCK_OE 2 -#define AUD_MISC_SEROUT_SCLK_OE 1 -#define AUD_MISC_SEROUT_SDAT_OE 0 +#define AUD_MISC_SEROUT_MCLK_OE 3 +#define AUD_MISC_SEROUT_LRCK_OE 2 +#define AUD_MISC_SEROUT_SCLK_OE 1 +#define AUD_MISC_SEROUT_SDAT_OE 0 /* AUD_FMM_BF_CTRL_xxx regs */ #define BF_DST_CFG0_OFFSET 0x100 @@ -684,6 +684,11 @@ static int cygnus_ssp_set_sysclk(struct snd_soc_dai *dai, value |= (sel << I2S_OUT_PLLCLKSEL_SHIFT); writel(value, aio->cygaud->audio + aio->regs.i2s_mclk_cfg); + /* Clear bit for active */ + value = readl(aio->cygaud->audio + AUD_MISC_SEROUT_OE_REG_BASE); + value &= ~BIT(AUD_MISC_SEROUT_MCLK_OE + (aio->portnum * 4)); + writel(value, aio->cygaud->audio + AUD_MISC_SEROUT_OE_REG_BASE); + return 0; } @@ -827,15 +832,12 @@ static int cygnus_ssp_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) * Shift the mask based upon port number. */ mask = BIT(AUD_MISC_SEROUT_LRCK_OE) - | BIT(AUD_MISC_SEROUT_SCLK_OE) - | BIT(AUD_MISC_SEROUT_MCLK_OE); + | BIT(AUD_MISC_SEROUT_SCLK_OE); mask = mask << (aio->portnum * 4); if (aio->is_slave) - /* Set bit for tri-state */ - val |= mask; + val |= mask; /* Set bit for tri-state */ else - /* Clear bit for drive */ - val &= ~mask; + val &= ~mask; /* Clear bit for drive */ dev_dbg(aio->cygaud->dev, "%s Set OE bits 0x%x\n", __func__, val); writel(val, aio->cygaud->audio + AUD_MISC_SEROUT_OE_REG_BASE);