Received: by 2002:a05:7412:6592:b0:d7:7d3a:4fe2 with SMTP id m18csp2110082rdg; Sun, 13 Aug 2023 09:35:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKLMI2gSXZRbkSesFhz7TMCz1XcjhFvnU+m+775W962frDyPoeskaL6bM0KTf/RwjokN6e X-Received: by 2002:aa7:de84:0:b0:523:3fa1:6a3a with SMTP id j4-20020aa7de84000000b005233fa16a3amr6190585edv.27.1691944542676; Sun, 13 Aug 2023 09:35:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691944542; cv=none; d=google.com; s=arc-20160816; b=CC9zYfl8Z08URt24ixxlMJlYPa9Tm+bK3rZYp5dB06YxqIcgQGxmXds+agzoER0i2i QXQN233hOkY+Fn1r7ZVdqkRSPxWO47SPNpD9JMFfGMTRXcILr106XUF8RU5+scZCYb0s dn96daoMmhQOS85zL2F7kbPdajh/wWc+dQm3aj9nU7DNN/iZe7ShgiUCQXEwIHamw6/v SSiC/DsAs4MeAZiBG9jNuoB94Sbf0Xa8+1JTREl3E3xj+dFnkyF7vDuuJhJ3XZhBWbAX lZzipEt6EoG3ly1XvdfNrhJ3Yz+XM6c/InyFil9em5sqyIqzfR26gvc4Of6iwYMkDxUH PwWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eGd8W4Pk6MPnk6EGgjnmMFvBsm+XJ3l8MMMtw0KeXAI=; fh=rEoObZc40Gk9piBjEX7NlVSdH9bsGWQteLi5JOEtWK4=; b=DVeg6bk2r7zArg2MnK/7b1LQZtZQi7P/wILLqOvLtSGbZ/1EhKXM3MtDJK1pdtyk3i 01JH/PkXW4NdizeEmOneXtl1TojNo/Oa/37rKp8Xfzn23Ziu7H/ycJy+41aTYWo0cb1M jHk0P+f18Hma1hBpnx9szIiajfJiUFCd5qGXl5Llh4UC6XJ0xJKs4sAheO4feKQjlSOg kjz30OmFl2sEPhpGZYXPYzsPMHHnwzowrKFcRiw4HfD29eTRACXpNidHwQfUbrsAqJMm 8ExKDqvxMu+pUZgmSh4Gc4txk6QFFHuQYJS0aSYNyTtFQmTceyRkjJrHBfIipduNQaQs Gieg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Re+Mop00; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n26-20020a056402061a00b005256697b9f2si296706edv.71.2023.08.13.09.35.18; Sun, 13 Aug 2023 09:35:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Re+Mop00; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232675AbjHMQJ6 (ORCPT + 99 others); Sun, 13 Aug 2023 12:09:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232664AbjHMQJd (ORCPT ); Sun, 13 Aug 2023 12:09:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09C861BC6; Sun, 13 Aug 2023 09:09:14 -0700 (PDT) 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 488FF622AB; Sun, 13 Aug 2023 16:08:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69780C433C8; Sun, 13 Aug 2023 16:08:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691942893; bh=W3VeFv9wAgczbNFGVTiDPKhWAcKQHHcPC6qVG9CyxwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Re+Mop00vjyIHhXg4W0ZFE8vYSkj5o9H9NWrFFafOKSF60cmzNvIZapQkTvMAdq+f g6YysE5vPfvFNukjBPE2QpeaBgsqXfOLPExuNrC7HOOOK9Lh1D0OkEPL8jXRVWEP+q 9KDv3q28DXA2PX+2ejdTiVL4+3QtkCuHvlteArpRT2A78e12Yq3gjV8aIUUhVYuk1+ LWhFAWweMzS7QOVV8/EywaoBihiaDilADx+bHaHSYwOd2LUImNmC5QHfBZo/2OGUXY DoQsATS0y+zdDQCrVgVx7zSna2QSD9fJlbpmLr1HQKaLvAUzKRVyedlRLHhwI7p1Fc 3R5LHxW0brdjg== 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 5.15 20/31] ASoC: atmel: Fix the 8K sample parameter in I2SC master Date: Sun, 13 Aug 2023 12:05:53 -0400 Message-Id: <20230813160605.1080385-20-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813160605.1080385-1-sashal@kernel.org> References: <20230813160605.1080385-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.126 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 6b3d9c05eaf27..4cb0605f6daa2 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