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 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2276C001DE for ; Sun, 13 Aug 2023 15:53:49 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A043A85D; Sun, 13 Aug 2023 17:52:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A043A85D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691942027; bh=CZ1VOSmecvmJzeT4sK3xTUGATLMgP7JW4yUzJyHes6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=BsB3RNlghjDmjd28XTSJ9EIL4tmOu8U1dg4FHO/EtM+NKcAzQD6skHe/oMdDeaJ1D CLsjywi6I6KTF839hS2w//Jce3CfBQO1DTXTg9Z0qfC2SeI9cAJje6OSyuxF0JTWtR DDvmDnQEwflU35TyRxs68vk+T0Nld+lHHsMgELBE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B4BFCF8057C; Sun, 13 Aug 2023 17:51:33 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 10949F805C5; Sun, 13 Aug 2023 17:51:33 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6FDF4F805BB; Sun, 13 Aug 2023 17:51:29 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3544BF805A8 for ; Sun, 13 Aug 2023 17:51:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3544BF805A8 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=J8882IR9 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 15F6263283; Sun, 13 Aug 2023 15:51:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D55AEC433C8; Sun, 13 Aug 2023 15:51:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691941883; bh=CZ1VOSmecvmJzeT4sK3xTUGATLMgP7JW4yUzJyHes6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J8882IR9FHXlyYiPqTLpYwSO4yZpvCEbGFVJx26WjKaKr2hHsSzxVPbT+7Fxu/jRW sWxwnLWzNNRcMYBXl0WMwF7oJnJ34pldkZk6PiHqrXSSYgeDZrzrWSePB2Hvav7LiT 1BJNW44ceozIERZEe2Wl7oLBH3iP/C9T5bi/EzurH9j1joPeh99ZdWikAemzgUwUBG Vu5b3Y2fFxpE4XZyhASrOaQ0En/fqe1iMzYS2gdbG5x2YzF36lygz54j+7FxD/tuCY 1p9oagYPSAjXc3EBvxgRIuajX3Px4GcLqDuBlwHbuREj99wzlBuSg86Iqo/Lgmp5LI LqhTpyaAORkxQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guiting Shen , Mark Brown , Sasha Levin , claudiu.beznea@tuxon.dev, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.4 33/54] ASoC: atmel: Fix the 8K sample parameter in I2SC master Date: Sun, 13 Aug 2023 11:49:12 -0400 Message-Id: <20230813154934.1067569-33-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813154934.1067569-1-sashal@kernel.org> References: <20230813154934.1067569-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.10 Content-Transfer-Encoding: 8bit Message-ID-Hash: 7U2TIAYE5ETC3F3UTIPM44MFLHHOE44U X-Message-ID-Hash: 7U2TIAYE5ETC3F3UTIPM44MFLHHOE44U X-MailFrom: sashal@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Guiting Shen [ Upstream commit f85739c0b2b0d98a32f5ca4fcc5501d2b76df4f6 ] The 8K sample parameter of 12.288Mhz main system bus clock doesn't work because the I2SC_MR.IMCKDIV must not be 0 according to the sama5d2 series datasheet(I2SC Mode Register of Register Summary). So use the 6.144Mhz instead of 12.288Mhz to support 8K sample. Signed-off-by: Guiting Shen Link: https://lore.kernel.org/r/20230715030620.62328-1-aarongt.shen@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/atmel/atmel-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c index 49930baf5e4d6..69a88dc651652 100644 --- a/sound/soc/atmel/atmel-i2s.c +++ b/sound/soc/atmel/atmel-i2s.c @@ -163,11 +163,14 @@ struct atmel_i2s_gck_param { #define I2S_MCK_12M288 12288000UL #define I2S_MCK_11M2896 11289600UL +#define I2S_MCK_6M144 6144000UL /* mck = (32 * (imckfs+1) / (imckdiv+1)) * fs */ static const struct atmel_i2s_gck_param gck_params[] = { + /* mck = 6.144Mhz */ + { 8000, I2S_MCK_6M144, 1, 47}, /* mck = 768 fs */ + /* mck = 12.288MHz */ - { 8000, I2S_MCK_12M288, 0, 47}, /* mck = 1536 fs */ { 16000, I2S_MCK_12M288, 1, 47}, /* mck = 768 fs */ { 24000, I2S_MCK_12M288, 3, 63}, /* mck = 512 fs */ { 32000, I2S_MCK_12M288, 3, 47}, /* mck = 384 fs */ -- 2.40.1 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3C81C001B0 for ; Sun, 13 Aug 2023 15:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=+8EUUJai7P/wkao9RHhW13xzHAfuflubTA4WuRz1R30=; b=Y3p/hpJ8IwHGWy yb7MuNMiqbmIhGi/8yoPkke5AlBdJQUq2RofPULX11NYpHdYKr0Gu24CR80mKmZQS+DmLzHiztda8 BEASIvorwTlMYImFyno4g0rncrnqFERSdUT7M+SnDK0khqv2thRP93PUwN2f6cd5ox2Gn6QG83Xvv V7dE+qcUbB5BFmd0ptmLx8UUygmsj0QEp7dyYWq3vU3LrON4HGygGpLYJutLe1ddNj68kztq2i/Fk qqiPcHKKvTPVA3U3FY/OsGHV63PILjuJSrpuYJB24KUxJcZeddJ/xZfObK7NilrG/4QXV78dYiuai Ry6qNyYYRNaBqxyXGGzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qVDNH-00FN8x-1e; Sun, 13 Aug 2023 15:51:27 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qVDNE-00FN8J-25 for linux-arm-kernel@lists.infradead.org; Sun, 13 Aug 2023 15:51:26 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 15F6263283; Sun, 13 Aug 2023 15:51:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D55AEC433C8; Sun, 13 Aug 2023 15:51:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691941883; bh=CZ1VOSmecvmJzeT4sK3xTUGATLMgP7JW4yUzJyHes6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J8882IR9FHXlyYiPqTLpYwSO4yZpvCEbGFVJx26WjKaKr2hHsSzxVPbT+7Fxu/jRW sWxwnLWzNNRcMYBXl0WMwF7oJnJ34pldkZk6PiHqrXSSYgeDZrzrWSePB2Hvav7LiT 1BJNW44ceozIERZEe2Wl7oLBH3iP/C9T5bi/EzurH9j1joPeh99ZdWikAemzgUwUBG Vu5b3Y2fFxpE4XZyhASrOaQ0En/fqe1iMzYS2gdbG5x2YzF36lygz54j+7FxD/tuCY 1p9oagYPSAjXc3EBvxgRIuajX3Px4GcLqDuBlwHbuREj99wzlBuSg86Iqo/Lgmp5LI LqhTpyaAORkxQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.4 33/54] ASoC: atmel: Fix the 8K sample parameter in I2SC master Date: Sun, 13 Aug 2023 11:49:12 -0400 Message-Id: <20230813154934.1067569-33-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813154934.1067569-1-sashal@kernel.org> References: <20230813154934.1067569-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.10 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230813_085124_726065_8F856583 X-CRM114-Status: GOOD ( 13.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , alexandre.belloni@bootlin.com, Guiting Shen , alsa-devel@alsa-project.org, tiwai@suse.com, lgirdwood@gmail.com, perex@perex.cz, Mark Brown , claudiu.beznea@tuxon.dev, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Guiting Shen [ Upstream commit f85739c0b2b0d98a32f5ca4fcc5501d2b76df4f6 ] The 8K sample parameter of 12.288Mhz main system bus clock doesn't work because the I2SC_MR.IMCKDIV must not be 0 according to the sama5d2 series datasheet(I2SC Mode Register of Register Summary). So use the 6.144Mhz instead of 12.288Mhz to support 8K sample. Signed-off-by: Guiting Shen Link: https://lore.kernel.org/r/20230715030620.62328-1-aarongt.shen@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/atmel/atmel-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c index 49930baf5e4d6..69a88dc651652 100644 --- a/sound/soc/atmel/atmel-i2s.c +++ b/sound/soc/atmel/atmel-i2s.c @@ -163,11 +163,14 @@ struct atmel_i2s_gck_param { #define I2S_MCK_12M288 12288000UL #define I2S_MCK_11M2896 11289600UL +#define I2S_MCK_6M144 6144000UL /* mck = (32 * (imckfs+1) / (imckdiv+1)) * fs */ static const struct atmel_i2s_gck_param gck_params[] = { + /* mck = 6.144Mhz */ + { 8000, I2S_MCK_6M144, 1, 47}, /* mck = 768 fs */ + /* mck = 12.288MHz */ - { 8000, I2S_MCK_12M288, 0, 47}, /* mck = 1536 fs */ { 16000, I2S_MCK_12M288, 1, 47}, /* mck = 768 fs */ { 24000, I2S_MCK_12M288, 3, 63}, /* mck = 512 fs */ { 32000, I2S_MCK_12M288, 3, 47}, /* mck = 384 fs */ -- 2.40.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel