Received-SPF: pass (google.com: domain of linux-kernel+bounces-127132-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Frank Li <Frank.Li@nxp.com>
Date: Mon, 01 Apr 2024 18:25:09 -0400
Subject: [PATCH 7/7] arm64: dts: imx8qm-ss-dma: fix can lpcg indices
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240401-dts_fix-v1-7-8c51ce52d411@nxp.com>
References: <20240401-dts_fix-v1-0-8c51ce52d411@nxp.com>
In-Reply-To: <20240401-dts_fix-v1-0-8c51ce52d411@nxp.com>
To: Rob Herring <robh+dt@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>, NXP Linux Team <linux-imx@nxp.com>, 
 Marcel Ziswiler <marcel.ziswiler@toradex.com>, 
 Philippe Schenker <philippe.schenker@toradex.com>, 
 Max Krummenacher <max.krummenacher@toradex.com>, 
 Alexander Stein <alexander.stein@ew.tq-group.com>, 
 Joakim Zhang <qiangqing.zhang@nxp.com>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, 
 linux-kernel@vger.kernel.org, Frank Li <Frank.Li@nxp.com>, 
 stable@vger.kernel.org
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
 =?utf-8?B?VzBPczNVRE5CQkFZZzdSOHpGN3dWaWVwdzkrd0VjajBZRGp6c244SXVveUVh?=
 =?utf-8?B?andLUzNqbkg1RkoxK1VKR3h1c09ZT1NwNkJpdGM2Z3R1bk9TQlFmOVo0SFhY?=
 =?utf-8?B?WG9Ea0M2bXdQdXg0UXVzVU1XQTloaUNGbGZxT3cvRDY1VVhzK1FvRE5EUmdX?=
 =?utf-8?B?SWprRnVMTitmZTVNV3l1elE1aGRKSFVpNkdFMUMwdTFTUzMyb3c0U2gwbEtS?=
 =?utf-8?B?c1FaVldzUE1uVG5VL2NCWmtLUHdBRGdUQ1NrUnRXeVFVS2E3aHQwdXNBSnRr?=
 =?utf-8?B?TmxybytNVEFSYmdnSS85NUowRGp5YWIzTkFPVHBKOG8vK2R1cStlMitXcVFo?=
 =?utf-8?B?Wm9oek9VOHU4SG56M1lJclQ4NU1MSFVlcy9ZU1JmbFMxQ2M1V2lKLzJZQkRL?=
 =?utf-8?B?UlU2UGxYVlVKTk9VRUo2Rm5ZcUpOYTFtdlFOb0svZ0xtd2FabzBwN3N5OXVs?=
 =?utf-8?B?MWRQVmVmektnMExUUi96dy9JemEzdE04K2h1dG9oWG4xZXNvV2xLVkVyZ1Ix?=
 =?utf-8?B?VlptNVdYelE3THVnVExuUWZwOXVtcWZxdk1YWllEclAxczk0WS9KNHU0SXB5?=
 =?utf-8?B?RUZmMmpGR0IrUWdldmhBcmNuSVJvemdnNDJJUDdqM0Nla0h3amJzRHhSZUhw?=
 =?utf-8?B?Umd2eDZEMXI0MWlOWDIxUjFFRFhFNjhEV1NWbkZ2VkoyeXI2MG1HaGhrUWtj?=
 =?utf-8?B?dGdnQVlFQzh5dEJzVTNmUUxxR05VSGlMZ1R6WXpsZHNvVU96SnBjYUVKcUpF?=
 =?utf-8?B?NVlrdDRTYTNmZC9qQjhhVWVxTjFydThpYnVkdVpReGZPazBQaXhyZVRGbVkv?=
 =?utf-8?B?U3Z6RHdRTk0zSER4YkZpb0x5Nys0U1FtLyt3enVpZFlZSXNDTjNxUHYxVnQw?=
 =?utf-8?B?TUV3d2t4eHN5TFlrNXJ3WnF1S29hOGcwUXRSSWtqd2d5VU9WZTFvNHgydi9W?=
 =?utf-8?B?K3NXL01sMnFLeGJOVXNqbnhENGU5cytRUTRWOUFpZmJnZWt2MjVYbE8vZGp1?=
 =?utf-8?B?cXdEOURzZFR6SlFhNU83c1F0VUdWV043UUx3Wnc5dkJ6N0FpejJvc21GOXJE?=
 =?utf-8?B?QitpUFA1UzQ0c1AvZnFSeCs2VDdzLzN1d2FaNlpnWWdpRkhCcEVTVHAxR0Vw?=
 =?utf-8?B?ZjA5T3RiMEZqNUwvTEZpWERuRUFSd0g4d29QRW4yWHpPRFFmZXVSRjM1UmxZ?=
 =?utf-8?B?WHNvVjhNeTJmNzd0NGMrYTF4enFxZENiMHVRbHhyWjVZZU5mcEdrWmlKL0xl?=
 =?utf-8?B?bGlDUjZPYTFNWElBdGxlSkZ3Mm9hMzJ0QzJLbDFjS1VVeW55VVdkb2ZyQlBH?=
 =?utf-8?B?ZkZCUUlxakNyR3N0T2RlYTNtdThhUUZUN0RlWnpIMVkwczYzSk82SFRra25S?=
 =?utf-8?B?VWJnWTZrRjc0dHJjcTg4WC9BblBkOUFESnVjcXJtZmpRblE5djF0NU8vNnlY?=
 =?utf-8?B?QVczdUxjS3lsYXNMSm1yaXVLMklVeVJPTTZCbG5ZYTFqZ044Tys1N1V4QVkr?=
 =?utf-8?B?ZDNzVVRwOXVpOUQ2NVZCRUhWdXhwVmFYMXZVNjlRNTdLaDJDaFJncWRyT2o3?=
 =?utf-8?B?S0RpUEUxcFdGK3RRbkhQRFZUdzRsZmQvMUdSVE93STZjUDAwdyt3ZXlwL1ov?=
 =?utf-8?B?MURtcEx5L3NKdWJhV3ZKdDBONWNRb0o0RFE1THRrV0tLeGYreVQxU050Nk0x?=
 =?utf-8?B?S2oxajFiZkZ3THB0aDU5a1lZaE8xVmFmVmVaUjEzZGhhUldQNzFEV1pGMGRB?=
 =?utf-8?B?dE01ME1KZXY0MzFzODloaGx6bCtvRXZoU2IzcjMzY2JzaHZYVnJjMERzd0Rt?=
 =?utf-8?B?VjJ4RlgxWEgwYkkxa0psT3pscVdxZjlMdWE2Wm5BNS9xZGRBOG1Fd29hMmlO?=
 =?utf-8?B?aG1lenRFTDVVZDJ4ZzR3bjhRWnhtKzl6SVFSVk1UYkx1RWx1aklVOFgyK0Fj?=
 =?utf-8?B?UDNhYWhjMS8yQWJFVlhyVFk1M1RwZG51KzdxOFJ0d1JVbTludE5UNkJZQUdx?=
 =?utf-8?B?TjN1UmZOM3g5OEFIeVlHdlh2bklDWFdndTZSbWtTbXZnVWJVZFlsOVBpamda?=
 =?utf-8?B?MXIrVlNhdkNwVEMxWkowdnNUNy91WjNVVm8wUUxUNCt4RDF0UHZoZWx5VExF?=
 =?utf-8?Q?gRNg=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 629f2247-8373-4336-4f63-08dc529ab80b
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2024 22:26:04.6719
 (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: 4tTfeiYsc3EM64dZdMXgZiT2Fv0pVYGCqRIplyq27Z8FoSjZlB52uA0T5X7X1dnx//W34a+bz0IeXHcBKj4kdQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB9976

can1_lpcg: clock-controller@5ace0000 {
	...						    Col1   Col2
	clocks = <&clk IMX_SC_R_CAN_1 IMX_SC_PM_CLK_PER>,//  0       0
		 <&dma_ipg_clk>,			 //  1       4
		 <&dma_ipg_clk>;			 //  2       5
	clock-indices = <IMX_LPCG_CLK_0>,
			<IMX_LPCG_CLK_4>,
			<IMX_LPCG_CLK_5>;
};

Col1: index, which exited dts try to get.
Col2: actual index in lpcg driver

&flexcan2 {
	clocks = <&can1_lpcg 1>, <&can1_lpcg 0>;
			     ^^		     ^^
Should be:
	clocks = <&can1_lpcg IMX_LPCG_CLK_4>, <&can1_lpcg IMX_LPCG_CLK_0>;
};

Arg0 is divided by 4 in lpcg driver. So flexcan get IMX_SC_PM_CLK_PER by
<&can1_lpcg 1> and <&can1_lpcg 0>. Although function work, code logic is
wrong. Fix it by using correct clock indices.

Cc: stable@vger.kernel.org
Fixes: be85831de020 ("arm64: dts: imx8qm: add can node in devicetree")
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
index 69cb8676732ea..475702947afff 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
@@ -112,15 +112,15 @@ &flexcan1 {
 };
 
 &flexcan2 {
-	clocks = <&can1_lpcg 1>,
-		 <&can1_lpcg 0>;
+	clocks = <&can1_lpcg IMX_LPCG_CLK_4>,
+		 <&can1_lpcg IMX_LPCG_CLK_0>;
 	assigned-clocks = <&clk IMX_SC_R_CAN_1 IMX_SC_PM_CLK_PER>;
 	fsl,clk-source = /bits/ 8 <1>;
 };
 
 &flexcan3 {
-	clocks = <&can2_lpcg 1>,
-		 <&can2_lpcg 0>;
+	clocks = <&can2_lpcg IMX_LPCG_CLK_4>,
+		 <&can2_lpcg IMX_LPCG_CLK_0>;
 	assigned-clocks = <&clk IMX_SC_R_CAN_2 IMX_SC_PM_CLK_PER>;
 	fsl,clk-source = /bits/ 8 <1>;
 };

-- 
2.34.1