From patchwork Thu Apr 26 11:15:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijendar Mukunda X-Patchwork-Id: 10365617 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 67D5F602DC for ; Thu, 26 Apr 2018 11:22:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 576F628E16 for ; Thu, 26 Apr 2018 11:22:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49D9F29076; Thu, 26 Apr 2018 11:22:23 +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.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3538A28E16 for ; Thu, 26 Apr 2018 11:22:21 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 7CB1D2677F5; Thu, 26 Apr 2018 13:16:12 +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 969562677FE; Thu, 26 Apr 2018 13:16:09 +0200 (CEST) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0063.outbound.protection.outlook.com [104.47.38.63]) by alsa0.perex.cz (Postfix) with ESMTP id 820F226722C for ; Thu, 26 Apr 2018 13:16:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=bcTgM2fsiEDIPH46KnEVSh25StO7pe1UUfUQLn2mV+M=; b=lVgkvIlVHN2BtxcWJAfsnkOfwrw/1XVaXxi64YGlhz3S1Bg4nH2BAq6K4BP1LzeuqEj//44Ix238wew8w0gTvbRTgi30WBYXMQmrfYEFawWt2RQ/OtP6cRUNVk6uEw5vjUiKfdunxVNcAWLCmY2Bpj0ysmO7pXlCXoMwmdzIlw4= Received: from BN4PR12CA0019.namprd12.prod.outlook.com (2603:10b6:403:2::29) by DM3PR12MB0762.namprd12.prod.outlook.com (2a01:111:e400:5984::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.13; Thu, 26 Apr 2018 11:16:05 +0000 Received: from CO1NAM03FT019.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::209) by BN4PR12CA0019.outlook.office365.com (2603:10b6:403:2::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.715.18 via Frontend Transport; Thu, 26 Apr 2018 11:16:04 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; linuxfoundation.org; dkim=none (message not signed) header.d=none;linuxfoundation.org; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT019.mail.protection.outlook.com (10.152.80.176) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.696.11 via Frontend Transport; Thu, 26 Apr 2018 11:16:03 +0000 Received: from LinuxHost.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.382.0; Thu, 26 Apr 2018 06:16:02 -0500 From: Vijendar Mukunda To: Date: Thu, 26 Apr 2018 16:45:51 +0530 Message-ID: <1524741374-13523-5-git-send-email-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524741374-13523-1-git-send-email-Vijendar.Mukunda@amd.com> References: <1524741374-13523-1-git-send-email-Vijendar.Mukunda@amd.com> MIME-Version: 1.0 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)(39380400002)(346002)(376002)(39860400002)(396003)(2980300002)(428003)(199004)(189003)(426003)(48376002)(356003)(50466002)(1671002)(105586002)(53936002)(4326008)(5660300001)(6666003)(7696005)(109986005)(77096007)(26005)(68736007)(486006)(50226002)(54906003)(53416004)(39060400002)(186003)(106466001)(316002)(2906002)(81156014)(8676002)(16586007)(81166006)(8936002)(476003)(126002)(11346002)(86362001)(47776003)(478600001)(76176011)(104016004)(51416003)(36756003)(97736004)(336012)(2616005)(305945005)(446003)(72206003)(266003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR12MB0762; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT019; 1:PInpZiOc0X/m4Aeges7cqdbu0eSBjVi42/QYcyKLuHb+4D2+vzjawwYa8/VOC8HRhlZSs3J9pWkq6LCwNXQ+PlhxDtxA5S3rPcyFresj81GATi90Uxj2WMBvB1QUY+ZS X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:DM3PR12MB0762; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0762; 3:5mfoH6Ka4aFrppjj1oX40mUxzy2LMGAUARzVdi/GryyGA0A+vmJvuVTLxmqN7r4ZSas0yRLmq4NcT0U77n1g6PvNtBLplrlVFkusheYGjGBTB5YZY478RNRiGhEgDaWqMHKDdHSDKJdoyzchh+eKOcyo5kWYFuez6J7oxF/esY3/hTS1veflGjIQ7ctc2eU7eRLUIt/Lh0rvKIoo8y991j65bMKiaRxLMz4oCLgnRfzRyLDdYuy3BUVHBlaGsCwt7vXa8qsWrUkvyR7S38FUPkAZJuRrOf0PAzgW/6PP3bpETtqoc/HtVaRrBCLUk+oR9jB4q5n9XVvTHQvnt9kpFCam1Nhf4LkVLQncuSf4DuI=; 25:/6JZgPzRMlhFaBx/VQBmH7vaskqWYXcepAgNKqzXrQUVLXOGwpKx+oxQExiUnJ6A8+ch7K/TU6XBiAOni3CsZBEVeCi+Zc8j3JAcx8XTKYsy9aoMv1uf5O/H8lCD178lSviQ7GqA4DSXiIdVbgwtiI5faCIf8TNRRHpfXAueuG2FfeR5hnCYzeABJJsbec2TIPbcFL+t+Byx2GqwNKN7ALwEuDLzWOmRj/xVTpRglupjX2+RVeTKFVU4nTWPHyEA1Knjbzh1Pp1XWUJcrYp7QqNaBB1ExPPRakCbXdfANisRupO9ujuq+DnWuAcAasrrVUycxCtSKGMb8pdiR3zWxS3NA8t0Eg5PcjEdeD0+QzM= X-MS-TrafficTypeDiagnostic: DM3PR12MB0762: X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0762; 31:4/dS15Xu3EBbJenSH+B/ZcdXO0svyzgNjmxKer7MHqpl8TRSyYChPo/EAPhpvsNi4GZop4n/znQzc3BECQbjRWHhXCS9cFPWFdUJDKJcT14yNwQOd442b2uGkvhtI8hhX8xsN1g4bHqznizv5zvypQPKiGsQooTXhYH2/FPGVCSXV9mQsZZCnUirTnopMyAFD3ZgvYZoFEINy0fPtjQCPPz6OeaJ1cczCyuDNVubpjY=; 20:ca8QlswJiWn+8omakVHZ9iU9gmcouKlEaA+crTOQz4vz0rlq+KrrALF2S33zK+imRdhKix0PxA/qc/+8jlR6qVZd5i+GIofVH32ROKIpZ6mgyZlvQr5Lsu9M4WFHGQDZZpSrga5oYHwuU2vedGBahHNo3mP5mxaA558LLJCLa7bvoocvVMMBIfdIpPmtc7SCZIqBkqnvXG4JgNiahrt9RKBVLGONycW8jsPPacNqj4NJ8tvTyTigDBUJ0jxP6BUP2NhNQJuU7gBF3pSKDw6RouQZ7uOd7jESqhIwxulhwN2Yey8wtczTnGmeD3z6hs7q3KsvaqR/7SgHuCeTjRaCmabGAfjE/SuFlVZxcLVvvOCsSlF+zcblfzf9T0QLOVB5ibjvk/PPnFFG+/nsSZvKmYuOcEsB1J9xNxgHZ5cTEeqxL2KRKmY418swikFAlMV7fH9H8wqc4ruIHMEQ92Ha669SFaq39qogm+CjyRDLXXqYeJmn0bLuFn8CjZYU9DkY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93003095)(3231232)(944501410)(52105095)(10201501046)(3002001)(6055026)(6041310)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DM3PR12MB0762; BCL:0; PCL:0; RULEID:; SRVR:DM3PR12MB0762; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0762; 4:7bfDEO8u9jLI6HXh+weiiTy34cmuy+6g6rTYsXX8pnX7yTOUE4ItlE25FYLuHyX9pS082eJxVO23k5jp2G0RiCtvMwXEN7u/pM5NVdzXih5GA2eTcz96feRHhvwUuduvPwUyPGOHTuFbu1wEkqK7xHq/jB3t8M3HGc0ySgdDK7WQeWe4MfVaIRGFEqQlLZWnnKj9NeRX4H43VSBBxftF1In0akOdlYKc+zxf9KN7j8aGEhGWlfGrlqOSOJG2pQpaaiDTIQYjJfEK7Fdi303TQqNEyhxIwIMjbyZ3FTIzIYlfyM3c28wmaLAJRZXwm5CR X-Forefront-PRVS: 0654257CF5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM3PR12MB0762; 23:JZbiXF6YT+3oIii1jWtJot6zEBFEOFhIVy5BnZenR?= =?us-ascii?Q?Lcn0wB759zwUh2k6TjARn7BC8Jc3Z7pl912B9kx9+rJVf2bJKVnJradP46Mx?= =?us-ascii?Q?iNcaXScWozHQ5Xn5mMlIvZ9qNRsAqVTQdaf5OhLrKhwM93jk6V70oaFYT3+V?= =?us-ascii?Q?RrRgXigdROr55vJw466KoscfX7Lv9e3AT3sLoYnFv0eR7R/ZHMydS/br5iqT?= =?us-ascii?Q?+VQRGNRRfhE0vJd4NN9//fGkZyXtZNeYqDtiRTnIZLhReCAgKB7iv+/8emhN?= =?us-ascii?Q?EOaM1fBRsODu1cu6H2UxDFFmFfyZNmwVGEo2oxo7+63XZQnfXRdKixyH/w+9?= =?us-ascii?Q?pgTcz3A1kcKa27hqBK3WsuaiIsTFM6SaQ3jiYCP/JZ8+OrecYJJQCJPToez6?= =?us-ascii?Q?uPFa7vrl3qYXiDawKH5cF2yqgGO4UiOJpqBDexXcDMadehMlQOTgU3OhwEex?= =?us-ascii?Q?spzvbg8yYqL2qzyyATyOOz5qNDxeS1u9s7tuROYErJ30aeiHMjMRlAgs75r1?= =?us-ascii?Q?MKH3o686Ok0SNc9mSayAkz0f9TgOK/GIkju134Fy/dLKpq1xaBGuoViLk4NR?= =?us-ascii?Q?poj4CzzgVBrPfpfwV8ShYF6VsWMRI7jw2m+xMjE9UKRQdXxYTCTIGb901JE/?= =?us-ascii?Q?3CwXY0qebonUld0f4lRxzvR8iAm6+9/I6X3YILckcRx1kXXLaTMc/JZkODkU?= =?us-ascii?Q?/G6tOqQ7kknJJzIOeZaCiWnPWlNDNkCLS3n9L422J2CMAKu+McKSxFPkUrSN?= =?us-ascii?Q?7Uligc5WIYk1wF4BVHQrvi8LgZxvXp/5GWPrQBUdoIksskC3Sf7RYQJ3jac6?= =?us-ascii?Q?BfBOotHxbFdVchDcbax8hAD7sy7fWwR1eVfEug9LIAsEhgWC9R1qioGAM7uM?= =?us-ascii?Q?/PHDNMdUt0QdZin2IqLHMNH/NVybhsYGff6TCW3dRFUufulUxq3iXxkM+w05?= =?us-ascii?Q?IX0a3uhguzjS2M7hePvVThuxdnmVZxDJsMcL/NLMnGMoVp/7cdN306AfABqE?= =?us-ascii?Q?f8xx9LwpF9/AkoHhpVbOmFkorXfyRvq50Lxcnd2TZeKhv8yxPCmYmraquTgN?= =?us-ascii?Q?TjwCGcKZI9b5xLq/DzLkMNZD+sbfZm21YGlQKconsaHhRyXdWfYg6sz+LA23?= =?us-ascii?Q?k3QCZae17pwecxYQl9LNGGp+xVTQ6Bimon2VslxGlj995BC9xbqVEy3IAzJo?= =?us-ascii?Q?vWz8iOQtp97flyE6HI05HXIQSSqPYcIZZpsLfQdAOOlmy5Q4wEZUJAHZw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: otUh1DVw+Y+emyn1N3OWdOKpfgRSu8bt69bttGuD154jSm50NLmqm7oKSPcGGAH8Wyqqz5BkQ7wVX9AM+QSY0Yu7fdwXfotpLfT3zTFW5hXpvgWkdDrwwHXP7DvGG2jF1TrYfO0RhcFM6QAZGN/1WPupQ+bv+rlGsCh3q677kSbuNB48ZwcRf2iGiJRa7oyu X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0762; 6:/Fl6jIx5R8sOB9fx4jbAQadnwUWjZbZD+/ur8TJo92t25M3vZxzev5LRxiElKi/g23CgKXwhuwzqQ2fM3GXjRnnSVXS0S3+Hmd6zyE9i5vthDS1z15OvYbe7NznGRuPzOPJyIGX5JarRdyrStbQnASBnGdHFb+srAESJU3GyTLpbhl9OvyaqPyAhrdHEur9dsYTCSZ3wVc2eC+e1rQhB3UlO7rApLVG+1jnCqqb9Z3YP1VAs25t1MC8SkcG1Pr8Ecf5Wv24NrWZZKEVKBNADHSU9DLbNc5Npfjde9ZGjR0vv1ti8sORcipc0CeGPPI4OR9KLvu5AsWGJKZxo7ntphSXwDx6VsP7A5qfxR6Qb1mX4Y3LvCGCcJM4Fm/sOQbyhkSgrjZZJygaxeENU5xudh8iTIY+SYzq/6q0Ibr5X9EAWc9Iin7Q+EBXNZNo7J8gQ+7LuR2qLDEWOSVCfizyHGQ==; 5:dQFprZu8AoHi9sx9R3sST/pY/vn6PnDCp2Up0k2lsP4kl3DxAeDguRZE8L6YZG1MmqUjL1YR2+jvx88K2+ANysEyRjb0k1iADk5XVwEkVX9TMY7JL+/cjfDaOsXYarwIBjUTxShw3QOR0nuRawAbPvw0DmZQs5sYwi5Ue1+ujCI=; 24:/by++zcyOAmiHDZwNRhuk5Gk55TZxSDVU++HMB6GEezDNj6WaNteJYHd/Jxh/2JfaDvfLNlQluxe5oZc76mFlMwKMHlU339dVuYIGAkyvdI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0762; 7:pX/SOe8aYONEcHqk34EVALLUkCdPSwaVBjhEGeFPD+hoFxZmNo8fnGqEpxbsB3KXoJmwuUB+wUw9oLkEr3IWNSMRnxDl3VIRlkKDoTO72u+h2EZdKwLZglr9YHb4MFTY7/kYmY44XcLBNO3rRRYO4rCvnVwI1LqG/wc5smCzz6rW3uCewueorkLVXCPlGIuhXny7vJJNl4qL1UKpgxJvu18huNoPdC2qLwKoJlWHu/Fvc+o35eriRlMfduPRszPE; 20:wmREZ1BdkoY0za7n6kfQ/QCzt49GKr3ASBt4nLcl1COtzP37rREINXupYiyuBZNUL8ykVnC2KMxxdQBlHyN4i95fM3UcTfM8GiiVctg4V+OMv97EpFtmYQYavdSzqZ2lK3Sr2xCFDH6dYuURGQwpUcRxEEsWYOefw+NTHXeKE52XOV3Iyr2VW7dIJfpBVBUuSEdqg8q7m0e192u8LD3E8YRPpBDECeChu8GHLk6MyE3bYrolYDa/4hQRLaXAExwP X-MS-Office365-Filtering-Correlation-Id: 26c12ef3-5123-4e05-252f-08d5ab671984 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2018 11:16:03.6802 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26c12ef3-5123-4e05-252f-08d5ab671984 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=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB0762 Cc: "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list , Liam Girdwood , Greg Kroah-Hartman , Takashi Iwai , Jason Clinton , Mark Brown , Vijendar Mukunda , Alex Deucher , Akshu Agrawal , Guenter Roeck Subject: [alsa-devel] [PATCH 05/11] ASoC: amd: pte offset related dma driver changes 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 Added pte offset variable in audio_substream_data structure. Added Stoney related PTE offset macros in acp header file. Modified hw_params callback to assign the pte offset value based on asic_type. Signed-off-by: Vijendar Mukunda --- sound/soc/amd/acp-pcm-dma.c | 26 +++++++++++++++++++------- sound/soc/amd/acp.h | 5 +++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 5f34be1..cb22653 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -320,13 +320,11 @@ static void config_acp_dma(void __iomem *acp_mmio, struct audio_substream_data *rtd, u32 asic_type) { - u32 pte_offset, sram_bank; + u32 sram_bank; - if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK) { - pte_offset = ACP_PLAYBACK_PTE_OFFSET; + if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK) sram_bank = ACP_SHARED_RAM_BANK_1_ADDRESS; - } else { - pte_offset = ACP_CAPTURE_PTE_OFFSET; + else { switch (asic_type) { case CHIP_STONEY: sram_bank = ACP_SHARED_RAM_BANK_3_ADDRESS; @@ -336,10 +334,10 @@ static void config_acp_dma(void __iomem *acp_mmio, } } acp_pte_config(acp_mmio, rtd->pg, rtd->num_of_pages, - pte_offset); + rtd->pte_offset); /* Configure System memory <-> ACP SRAM DMA descriptors */ set_acp_sysmem_dma_descriptors(acp_mmio, rtd->size, - rtd->direction, pte_offset, + rtd->direction, rtd->pte_offset, rtd->ch1, sram_bank, rtd->dma_dscr_idx_1, asic_type); /* Configure ACP SRAM <-> I2S DMA descriptors */ @@ -788,6 +786,13 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, } if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (adata->asic_type) { + case CHIP_STONEY: + rtd->pte_offset = ACP_ST_PLAYBACK_PTE_OFFSET; + break; + default: + rtd->pte_offset = ACP_PLAYBACK_PTE_OFFSET; + } rtd->ch1 = SYSRAM_TO_ACP_CH_NUM; rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM; rtd->destination = TO_ACP_I2S_1; @@ -797,6 +802,13 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, mmACP_I2S_TRANSMIT_BYTE_CNT_HIGH; rtd->byte_cnt_low_reg_offset = mmACP_I2S_TRANSMIT_BYTE_CNT_LOW; } else { + switch (adata->asic_type) { + case CHIP_STONEY: + rtd->pte_offset = ACP_ST_CAPTURE_PTE_OFFSET; + break; + default: + rtd->pte_offset = ACP_CAPTURE_PTE_OFFSET; + } rtd->ch1 = SYSRAM_TO_ACP_CH_NUM; rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM; rtd->destination = FROM_ACP_I2S_1; diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h index 82470bc..2f48d1d 100644 --- a/sound/soc/amd/acp.h +++ b/sound/soc/amd/acp.h @@ -10,6 +10,10 @@ #define ACP_PLAYBACK_PTE_OFFSET 10 #define ACP_CAPTURE_PTE_OFFSET 0 +/* Playback and Capture Offset for Stoney */ +#define ACP_ST_PLAYBACK_PTE_OFFSET 0x04 +#define ACP_ST_CAPTURE_PTE_OFFSET 0x00 + #define ACP_GARLIC_CNTL_DEFAULT 0x00000FB4 #define ACP_ONION_CNTL_DEFAULT 0x00000FB4 @@ -90,6 +94,7 @@ struct audio_substream_data { u16 destination; u16 dma_dscr_idx_1; u16 dma_dscr_idx_2; + u32 pte_offset; u32 byte_cnt_high_reg_offset; u32 byte_cnt_low_reg_offset; uint64_t size;