From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D6D5C43331 for ; Wed, 13 Nov 2019 07:16:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFDD1222C2 for ; Wed, 13 Nov 2019 07:16:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="lJZvsdOv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbfKMHQM (ORCPT ); Wed, 13 Nov 2019 02:16:12 -0500 Received: from mail-eopbgr750044.outbound.protection.outlook.com ([40.107.75.44]:54180 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726160AbfKMHQL (ORCPT ); Wed, 13 Nov 2019 02:16:11 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fwSo1lKWdkmWzQVhAfWFbaWO4TXqT6QsSU72rBcF5JoNbWSRUK/kmCVRZDRqc3reHAJnwAyhaxdfcYI5FHQ7CvsUk+FU5O/d75kqdE2u2dWkSHzoG56XQIkXEqm1gg9/gq84XId+sHB6ED/IAsJWHkzOcwDNhbX43WgqK10wQhodNucPW91A5CUjUN2xtHCgiYj1bb8SE/USo5WL6dm4lrvHXyL8ej/Su5yP7IWL2Ys/SdoUwBCgxY9HJsz4wWGP/yaP5Goie+PG84J702UOeLnIKSlMNrFXxBB4JwKf+3i41PFCbNISMSWspm4vxrSCTRBJdfZp9T4/73AJuNx3cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PLPIAKLEjVonlAaHkIJsqjB82FIYgfUPiLNRgE+lJ80=; b=j8nKNl6JjH4n82jImZ0Skf4b9ch/mbU2oU4fz0zqpIDFTqQgUP3nGu5jd9pGNsgpVg9NgjdbXMGu+TqB/MRSBn68LvEOrzynVDgNJKn2Mn0s2f4wVUTqeNou5/mKo7qUcG0V+AOETW7rdKgyJyOhL9QOwrMRZgdQ6vvGNhbmM99i+yHw5oexVotszthQlnjkfuZLwP7tVxbdHVJoMq3bkLrCJA87Y+kHi5Fwx4HMjEJvrpt8YnSMZQ8cytutw2Br47D2FgtTaPaHMIeavQG6MgWX3ZkGW8UtKeVcTIkNAQDcDeGSVO3rWiX1tHR5n8vqi5OKkPo6KNTRtDTZ8bZ7AA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=google.com smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PLPIAKLEjVonlAaHkIJsqjB82FIYgfUPiLNRgE+lJ80=; b=lJZvsdOvYiEkKCxWjfbv6EdRCTLDJrjRk3t2Lwrf3rMYF2N845jMO7BNYuwOb4GBQ++VFArSLozkLvxWSCZkra4tBI8GKL31OSOFQPsL9U1bVGuHbpZ+5nZefywnHv+/rcZQxBbMSvWDm/ajlTjemCMY2Wj9Zwar6H4nk4M6+x0= Received: from MWHPR12CA0042.namprd12.prod.outlook.com (2603:10b6:301:2::28) by BYAPR12MB3381.namprd12.prod.outlook.com (2603:10b6:a03:df::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2451.23; Wed, 13 Nov 2019 07:16:06 +0000 Received: from BN8NAM11FT055.eop-nam11.prod.protection.outlook.com (2a01:111:f400:7eae::203) by MWHPR12CA0042.outlook.office365.com (2603:10b6:301:2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2451.22 via Frontend Transport; Wed, 13 Nov 2019 07:16:06 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; google.com; dkim=none (message not signed) header.d=none;google.com; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXMB02.amd.com (165.204.84.17) by BN8NAM11FT055.mail.protection.outlook.com (10.13.177.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2451.23 via Frontend Transport; Wed, 13 Nov 2019 07:16:06 +0000 Received: from SATLEXMB02.amd.com (10.181.40.143) by SATLEXMB02.amd.com (10.181.40.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 13 Nov 2019 01:16:03 -0600 Received: from vishnu-All-Series.amd.com (10.180.168.240) by SATLEXMB02.amd.com (10.181.40.143) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Wed, 13 Nov 2019 01:15:55 -0600 From: Ravulapati Vishnu vardhan rao CC: , , , Ravulapati Vishnu vardhan rao , Liam Girdwood , Mark Brown , Jaroslav Kysela , "Takashi Iwai" , Vijendar Mukunda , "Maruthi Srinivas Bayyavarapu" , Alex Deucher , "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [RESEND PATCH v5 4/6] ASoC: amd: add ACP3x TDM mode support Date: Wed, 13 Nov 2019 12:44:07 +0530 Message-ID: <1573629249-13272-5-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1573629249-13272-1-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> References: <1573629249-13272-1-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(396003)(346002)(39860400002)(376002)(136003)(428003)(189003)(199004)(50466002)(109986005)(16586007)(54906003)(36756003)(316002)(86362001)(4326008)(7696005)(76176011)(186003)(6666004)(356004)(48376002)(2906002)(26005)(47776003)(51416003)(1671002)(426003)(70206006)(336012)(478600001)(305945005)(11346002)(50226002)(70586007)(446003)(8936002)(2616005)(476003)(126002)(81156014)(486006)(81166006)(8676002)(53416004)(5660300002)(266003)(32563001);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR12MB3381;H:SATLEXMB02.amd.com;FPR:;SPF:None;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93fd3715-d4b0-4473-c5f9-08d768095976 X-MS-TrafficTypeDiagnostic: BYAPR12MB3381: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-Forefront-PRVS: 0220D4B98D X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XDFFO/gRjX53sJxVckYh8kuemZvxB+sQHbWRsxWohrulhzwwiYCk5QvGNivbnRjS12qCWevo3XselxFLrDGTAWU+D3q2j36bwGnFwFfeb7McJ0lTAVEWTlslNS1azFmzvuM7BEtNTREQShgtG1JXGls9TILiKUFKOft5LwQSySQ/et2l1C47nbijZeux3xM5kP9pEDwUNJP0Ik2v9Kw8kCN9zbaNDbwZOuEXJM8kOA3mfmkKfZSAfFmuuMgMIfBWFoEMGavHMa3CSbc0TUcAYcK+ZJjgwysgcEt9v+PhS2abgj2AZrx2mfniMRy+0cM43/O9e0kqyYds6dsylfrD+MZFwVjs8NMQs31arstrxrFXIzqcSq3BmG9dYNzyj+5g2BeWjmCiR67cEjMhPvNh9kcLMOxtwFP3NAmoAymJNyuagEi51RVy4Rzit1UxHS5O X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2019 07:16:06.0714 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93fd3715-d4b0-4473-c5f9-08d768095976 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3381 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ACP3x I2S (CPU DAI) can act in normal I2S and TDM modes. Added support for TDM mode. Desired mode can be selected from ASoC machine driver. Signed-off-by: Ravulapati Vishnu vardhan rao --- sound/soc/amd/raven/acp3x-i2s.c | 51 +++++++++++++++++++++++++++++++++-------- sound/soc/amd/raven/acp3x.h | 2 ++ 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index bd0ec68..f6b306d 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -43,7 +43,7 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, u32 rx_mask, int slots, int slot_width) { u32 val; - u16 slot_len; + u16 slot_len, flen; struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); @@ -66,16 +66,47 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, return -EINVAL; } - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER); + /* Enable I2S / BT channels TDM and respective + * I2S/BT`s TX/RX Formats frame lengths. + */ + flen = (FRM_LEN | (slots << 15) | (slot_len << 18)); - val = (FRM_LEN | (slots << 15) | (slot_len << 18)); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_TXFRMT); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_RXFRMT); - - adata->tdm_fmt = val; + if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) { + switch (adata->i2s_instance) { + case I2S_BT_INSTANCE: + val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); + rv_writel((val | 0x2), + adata->acp3x_base + mmACP_BTTDM_ITER); + rv_writel(flen, + adata->acp3x_base + mmACP_BTTDM_TXFRMT); + break; + case I2S_SP_INSTANCE: + default: + val = rv_readl(adata->acp3x_base + mmACP_I2STDM_ITER); + rv_writel((val | 0x2), + adata->acp3x_base + mmACP_I2STDM_ITER); + rv_writel(flen, + adata->acp3x_base + mmACP_I2STDM_TXFRMT); + } + } else { + switch (adata->i2s_instance) { + case I2S_BT_INSTANCE: + val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); + rv_writel((val | 0x2), + adata->acp3x_base + mmACP_BTTDM_IRER); + rv_writel(flen, + adata->acp3x_base + mmACP_BTTDM_RXFRMT); + break; + case I2S_SP_INSTANCE: + default: + val = rv_readl(adata->acp3x_base + mmACP_I2STDM_IRER); + rv_writel((val | 0x2), + adata->acp3x_base + mmACP_I2STDM_IRER); + rv_writel(flen, + adata->acp3x_base + mmACP_I2STDM_RXFRMT); + } + } + adata->tdm_fmt = flen; return 0; } diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index c071477..01b283a 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -76,6 +76,8 @@ struct i2s_dev_data { bool tdm_mode; unsigned int i2s_irq; u32 tdm_fmt; + u16 i2s_instance; + u32 substream_type; void __iomem *acp3x_base; struct snd_pcm_substream *play_stream; struct snd_pcm_substream *capture_stream; -- 2.7.4