Received-SPF: pass (google.com: domain of linux-kernel+bounces-123112-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Frank Li <Frank.Li@nxp.com>
Date: Thu, 28 Mar 2024 10:51:36 -0400
Subject: [PATCH v8 4/5] arm64: dts: imx8: fix audio lpcg index
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240328-asrc_8qxp-v8-4-801cd6bb5be2@nxp.com>
References: <20240328-asrc_8qxp-v8-0-801cd6bb5be2@nxp.com>
In-Reply-To: <20240328-asrc_8qxp-v8-0-801cd6bb5be2@nxp.com>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, 
 Rob Herring <robh@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Shawn Guo <shawnguo@kernel.org>, 
 Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, Shengjiu Wang <shengjiu.wang@nxp.com>
Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org, 
 imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, 
 linux-kernel@vger.kernel.org, Frank Li <Frank.Li@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?QVVtM3NKb3l1dHc5RGtCTzJnSjhvV0thVW5XWmtidXQyRmJwRnNXZVgzSCt5?=
 =?utf-8?B?NXZxTmRsUS94cWVwRitsOTM5M01iQUdkTHJMZjEySGEwVytZUHIwK29YNjJD?=
 =?utf-8?B?cUVIT1MzVnY4NlVNcDNtVzRPYW1wOFFNZWovWlVXT2VGdC9vNWFpM3pXV0l6?=
 =?utf-8?B?SHJIWG5yNUp6Vk95dCtvUTN2blJ3YjBLQnpBSDM4Z29TRHB5bkg1S3NUOWNL?=
 =?utf-8?B?ZXFiYkRMaGpLOGFBZnR6OGtRbXRSWFVZL1E1ZFN5dUdiTEFzajdmb2FLQWxx?=
 =?utf-8?B?K0pHMlEvbHcvd0pLak9KM0xOVXpVWEVSbnV6N0dXZmFRVkx1OURNL29VNjlN?=
 =?utf-8?B?bUhCNjQzZTRUNEV1LyszZXpWVVNmYlE5SzVEd2M0V0pyYnV0bWgxamM4elVy?=
 =?utf-8?B?aUNOTnJJcHVobmZLUEF0WGxEL042OTZkN3dnMEVTcEF5NE51TldMcStLQ2gz?=
 =?utf-8?B?djVtS3dCdGlyejh0TjdEM3RqbjlQTlFRRVYyb0xiaGpjVzF0YjRNQ1NKK1pU?=
 =?utf-8?B?VGdjL1JtcEtwamFhNHVET3N6dWY2THVFL1hEWENWQU9TcWdaTWlyVXBpNmt2?=
 =?utf-8?B?OEprY3B0SlNYQ3c1WU5Cblc3TFplSURIQS9mNWVHS1UyUHpWYkFEZ29CS2pX?=
 =?utf-8?B?bjJzVkV1ZFBYMFVqNTV4bUM3eFFUM085aGtnb25iQXhQemh2NGlYOThkQnFq?=
 =?utf-8?B?dTkvUHpzdjFTdkVaNVI3WlcwVFl6ZjlVWnF6eXZpQUREVUFHS2s3ajNQdkgw?=
 =?utf-8?B?ZnREZWVHUTZ4c0lyWHp2U1hMRkI5Yi9lOHZBN0pNR0JycVFhT1o1SElMNGJK?=
 =?utf-8?B?RWprV1BJNHM1MXRkYkQwV2g4LzNxMmY5aUYrN01wTkJEVDNBOUZDT0l0TSs3?=
 =?utf-8?B?YnNGMCtpMHZ5WHVZQXpwTmFHak9rVVlmZXpjZ1F4aDk2QU96MXBXcjNJc2Z2?=
 =?utf-8?B?bjNXbEdXRXhwM1QxbzlZaUNNTnl2ZXlIRFliTDFHSmNiYXN6RSswU2NhVlhC?=
 =?utf-8?B?R1JHeDlsT3lXQ3lKeFZjNTVnQWk0dkUvRWphN1RNMm1oY3VGZTd6U3dmN1pu?=
 =?utf-8?B?aTF5YUtTNVlmOHhyNTJuRW1NdUwxQVgvczBycmo3V1dlcE4rbStnY2hvYlN5?=
 =?utf-8?B?VTdYYjh0QzV2MnVFdXZ5UFY1Wkd3VXNCU0gzYW5rMG9pQmxabWRyVUozZ2hO?=
 =?utf-8?B?RXB2RGo3eGZEZDNPSEVsUUlKTjltNHE1ZkhlVkt2dERueWV6NWx0eTBDK05r?=
 =?utf-8?B?akdmRDV1VjdrblMwUHdrR0YwdmYzeVJ0VUJuTXhuWkFlUmJIbThQUmIzYXY0?=
 =?utf-8?B?bkh6QjdKWG5yM3FaMjl3WGZUS0xTd251bGF0bnJiQUdQMW15N0EzVGFpeisy?=
 =?utf-8?B?S0Z0UW1MaGJwV3Fnd2VuNmJOQmNCb3lsTi9NOXd4aTJLc0djMkhJR21OaU5r?=
 =?utf-8?B?L2N6ZkVsRzZZNUF1cmNjaDUrNTNJdGEvVThVcjZMQUl4R2hNY2JBeThuUCtC?=
 =?utf-8?B?Q21DTlM1dW45NDJQWmRRVXpodEJzMGZjaktHSm04Q000TWpOR0s2bXYvRWl2?=
 =?utf-8?B?Z1JUM2JIbzFycEZmazdUbG1uOGZuMU9Lc3p6QjhscFRJOUdLcmNPZW5FMXRY?=
 =?utf-8?B?SUVNWDNXamxjWWdNOXBJRjJ3QUdBamV1ajRiNkVENEpwYXJldlNSMndtWUdL?=
 =?utf-8?B?ays3YlJPWXg5dDFBMGs1by8yYXg0bGpmdU02RG1CaVZTVGdyb1BuK21Qekoz?=
 =?utf-8?B?cEFCQzdXc1JTYU9VSWlPQWZUL3IvOC9XUjhZV2w1eGlnSkVhSnhKbHhsUWlS?=
 =?utf-8?B?TnRab1NvY0U0K2lPWWE4dUlxdWZkc0Z1Y3BTWnVNS0FlQ3lFaElSWUZHMG15?=
 =?utf-8?B?U3M0ZFFlbW5NMXdwSXgrbFZFdCtVS0YrSzEyelFGdUNWL0FXUmdESGtZU0FM?=
 =?utf-8?B?Z0hLZTNLc05wZlVpYm0yOUVIbHdXNzV4NmZlWCt2OTd5ak4rWkxNV0NsUlVt?=
 =?utf-8?B?MWtrYVRURW85ZCt6c2xrYU05cit1aGhOLzR1SS9WemQ4MmpEdXdweWcxMUlJ?=
 =?utf-8?B?cDdYTHc3YWpVTHA2SnJSQ1F6Y2g0Uy9DVXlQblZ4QU5Vem9SeGttZitkbDJB?=
 =?utf-8?Q?WqvVB0h9xmZDx6gGPN7vVQZuF?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 251bb4fb-b304-4fb2-7702-08dc4f36a9e1
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 14:52:17.7812
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: AfILx6AytqDQNFORDVCv7tkfga1OO/2J85OiiSbZ2t27e8Ji/MZFyF4K6xLkX48plujgJsum5JSG11WLrxwnRw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8880

lpcg cell0 should be clock's 'indices' instead of 'index'.

imx_lpcg_of_clk_src_get(struct of_phandle_args *clkspec, void *data)
{
        struct clk_hw_onecell_data *hw_data = data;
        unsigned int idx = clkspec->args[0] / 4;

	....
}

<@sai0_lpcg 1> will be the same as <@sai_lpcg 0>.

Replace 0 with IMX_LPCG_CLK_0 and replace 1 with IMX_LPCG_CLK_4.

It can work at iMX8QXP because IMX_LPCG_CLK_4 is ipg clock, which already
enabled. But for iMX8QM IMX_LPCG_CLK_4 is mclk, which trigger issue.

Fixes: 0a9279e9ae88 ("arm64: dts: imx8qxp: Add audio SAI nodes")
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
index 07afeb78ed564..d8bbe53320bce 100644
--- a/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
@@ -123,9 +123,9 @@ sai0: sai@59040000 {
 		compatible = "fsl,imx8qm-sai";
 		reg = <0x59040000 0x10000>;
 		interrupts = <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&sai0_lpcg 1>,
+		clocks = <&sai0_lpcg IMX_LPCG_CLK_4>,
 			 <&clk_dummy>,
-			 <&sai0_lpcg 0>,
+			 <&sai0_lpcg IMX_LPCG_CLK_0>,
 			 <&clk_dummy>,
 			 <&clk_dummy>;
 		clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
@@ -139,9 +139,9 @@ sai1: sai@59050000 {
 		compatible = "fsl,imx8qm-sai";
 		reg = <0x59050000 0x10000>;
 		interrupts = <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&sai1_lpcg 1>,
+		clocks = <&sai1_lpcg IMX_LPCG_CLK_4>,
 			 <&clk_dummy>,
-			 <&sai1_lpcg 0>,
+			 <&sai1_lpcg IMX_LPCG_CLK_0>,
 			 <&clk_dummy>,
 			 <&clk_dummy>;
 		clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
@@ -155,9 +155,9 @@ sai2: sai@59060000 {
 		compatible = "fsl,imx8qm-sai";
 		reg = <0x59060000 0x10000>;
 		interrupts = <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&sai2_lpcg 1>,
+		clocks = <&sai2_lpcg IMX_LPCG_CLK_4>,
 			 <&clk_dummy>,
-			 <&sai2_lpcg 0>,
+			 <&sai2_lpcg IMX_LPCG_CLK_0>,
 			 <&clk_dummy>,
 			 <&clk_dummy>;
 		clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
@@ -171,9 +171,9 @@ sai3: sai@59070000 {
 		compatible = "fsl,imx8qm-sai";
 		reg = <0x59070000 0x10000>;
 		interrupts = <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&sai3_lpcg 1>,
+		clocks = <&sai3_lpcg IMX_LPCG_CLK_4>,
 			 <&clk_dummy>,
-			 <&sai3_lpcg 0>,
+			 <&sai3_lpcg IMX_LPCG_CLK_0>,
 			 <&clk_dummy>,
 			 <&clk_dummy>;
 		clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";

-- 
2.34.1