Received-SPF: pass (google.com: domain of linux-kernel+bounces-127131-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Frank Li <Frank.Li@nxp.com>
Date: Mon, 01 Apr 2024 18:25:08 -0400
Subject: [PATCH 6/7] arm64: dts: imx8-ss-dma: fix can lpcg indices
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240401-dts_fix-v1-6-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?VkZDL212TlM0S3EvTkpENkY4Tzh2S1pvb1p2Q0FNUGFSdzJaLzB1SDM1ek0r?=
 =?utf-8?B?Q0hLWU9QVkx5ODB6Y2dYaVp5UXc5UXFEVHMrU0lZbWZqdkwrMEoxUnh5Z2ZP?=
 =?utf-8?B?Vk5CVU9oc3RWNXZtY3diQjZKZkJVbWlyUFgwN1JmUjBDRTg0Q2RhaUxTc295?=
 =?utf-8?B?TlhMdXp6cjJ5TUcvdnhCbjVaVE80eVVBeTBrMWVYYzZ6QlRSV2xNVW5CQXhL?=
 =?utf-8?B?Z3JDbDVwK1g3WlpkMy9XS3BmRlNKdy9LdUZGbmdiSHR5c3dQblRvOTNTa1Vh?=
 =?utf-8?B?ak5YNkMyUlQrbFBMWjJBSThsRUNrR0hVUnBEVmJxMklsN1NqS1RrbUZxZHRy?=
 =?utf-8?B?WllmaFBqNnM0TGROTmFaakNnVEJCT3ZYRndkakFSSFZYQWFWUTErNFA5WDkr?=
 =?utf-8?B?NnZKeHV1VHNQRXFiZURuZzgvQTlpdzZOZVQ4aE1NYWJRQkIyYlpwYk5YeWFz?=
 =?utf-8?B?ZFVDczJLQjkzVER4OTM1U3hGaWFjZEladzVFM0dRWW5remg4UEVFNDVMZHFW?=
 =?utf-8?B?dmlhOU9iaEk3RnljNGxnMUdFZlYwbnhhTmpySmZ4b2lIamJBcEE0TnAvZkU2?=
 =?utf-8?B?ZnErQ1ZTN3U1T25WN25LZVZKY3E2ckV5bnRFRUQyaWlwUWRnR1BVem9YbmFl?=
 =?utf-8?B?UHY5YjlzalhaWmEyTk01VHhZT3NyYkNMNExXdDA0RFQ3WmhtejVPa3dUZ2hy?=
 =?utf-8?B?YjlMa1NVTWdsd0dha29EMEZIQVZSL1o1ODYwbXBCQXRDVUJFYWloeUs2NnZk?=
 =?utf-8?B?bVNhakw0d0JEVGJUZXdrckRXMkJkbGRZbGRsQk1JNDF2ck40WEw1Rzl3azlm?=
 =?utf-8?B?eHNuMGZtVjcxaEV3QVJvRnFicDRNUTNSQWV5Q0U4ZmZ1SmZEWmF4OUFhZEt1?=
 =?utf-8?B?TlN4L0M4ZFFLR04yQnhHN2pkMHNrc0JzbFJxeDhtQk5jczVLZER4MzlMblNO?=
 =?utf-8?B?ZXBzY3pLMnE3cDBqbDlQRVg0N1Z1bFpac0ZITlVWclNySlp0NXhubDJ6WlFB?=
 =?utf-8?B?bWJvU3crK1AvaUhMMnFFbWtYNEg4UGFxYUtSUVdVNDc2REpWSUpWbktNMGR0?=
 =?utf-8?B?R2N0dWorYzdXcFIwSi9LRlZHR2hDZUxGN1p2UjAxY2dMYUFrS04yaFplUXF3?=
 =?utf-8?B?WE1tb2VzRURJNGw3MDdTT0Vid0lHTWNUSGlLbW1rWEd5Y2JzMGN2REducHJ0?=
 =?utf-8?B?aTVTdXdPOEg5K3A2WmFkT2JjSG1RSUlFNVA5K05pNzRqOUpQR0YxUUZ2Qkdl?=
 =?utf-8?B?WXpBczgrS3p0YjdwRzVVTVprbXdtQ2pmbzUzK3lweWU1TW5nNHZmcWp4dHRk?=
 =?utf-8?B?VW5MZGdjK01SM2lLaWVwT3F6akFka29sanNQSEg0UkVqY0wraEU4OFVGM1I0?=
 =?utf-8?B?QUNKMzFuSkordlZhNVQvT0RWNzRlYjF6eitDdUJvNkVqU0NyRFRZY2Rlem5n?=
 =?utf-8?B?Z09kYnZWUGdsOHBNQlBuTXJkbUo1K2tTMEd2L1lneG92MWFjSnhRMGI4aUxl?=
 =?utf-8?B?UFo2WnNJRVRPR1IvUWFuQVVySWhOcXVsZ3ZFRkRLUXQ4czBaQUVTN25DR3VS?=
 =?utf-8?B?VlV2cHhuVTBpcGdINFdHNVl3U2FxTUN5d2Z5MTBRbGs2VHZFcDBCN0hhTFBx?=
 =?utf-8?B?OGRTRStkcCtyT2k3eDl5MHhFd3p3Qmw0bStSR0VDczBpZDB6YmZ6MlFzR0Rq?=
 =?utf-8?B?c3NXQTBYUzBRcGxOVTdQTnJFQzJNOHpuWmtNSWtueFRRWFpmTVM1b2s5REJh?=
 =?utf-8?B?cG9pQVUxSGYyRU9DMmJlNCtuN0N3VmUrNFd4Z0dDandKbld0RVlGSEtONzF4?=
 =?utf-8?B?eGJld09WeWh3QkEvUllTU09pVVZqb09ubktROEJ6NkZlaGxPWkkxSSthSFZp?=
 =?utf-8?B?K1Vwd0IrWEJNK25kWGJEeVdwZHBxTTdrcmlBRitHSFVJVkJMc3FWb2ZjUmN0?=
 =?utf-8?B?VFpQVmw4dHlHaTY4WW5LS3R4WkxueWxIL3VtTlRIa0tLaG01M0JDL1RVQnNo?=
 =?utf-8?B?N2JoTXRFbHVNNUw5eXdicWhqMWtWOG0vS080aVNxZXRtRkVQUHVJMXR6NGxR?=
 =?utf-8?B?allaVGpGOUo4T0tpZDRqSWJESS9XZU5Da2RKSXpaZFFRNmtrQ0dCQ0hubjV1?=
 =?utf-8?Q?wU1g=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e20618cd-2734-4a38-cd40-08dc529ab585
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:00.4359
 (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: YTCo1qOAsCofITJigvj+FC1Q5LGTcbLBcYqDG83GO5/8ZSPfDvQKMguB/lp7c/MLYah20aismRIShL+zxxdM4Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB9976

can0_lpcg: clock-controller@5acd0000 {
	...						   Col1  Col2
	clocks = <&clk IMX_SC_R_CAN_0 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.

flexcan1: can@5a8d0000 {
	clocks = <&can0_lpcg 1>, <&can0_lpcg 0>;
			     ^^		     ^^
Should be:
	clocks = <&can0_lpcg IMX_LPCG_CLK_4>, <&can0_lpcg IMX_LPCG_CLK_0>;
};

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

Cc: stable@vger.kernel.org
Fixes: 5e7d5b023e03 ("arm64: dts: imx8qxp: add flexcan in adma")
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi
index 77ba2dd6847b4..67b3c7573233a 100644
--- a/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi
@@ -406,8 +406,8 @@ flexcan1: can@5a8d0000 {
 		reg = <0x5a8d0000 0x10000>;
 		interrupts = <GIC_SPI 235 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-parent = <&gic>;
-		clocks = <&can0_lpcg 1>,
-			 <&can0_lpcg 0>;
+		clocks = <&can0_lpcg IMX_LPCG_CLK_4>,
+			 <&can0_lpcg IMX_LPCG_CLK_0>;
 		clock-names = "ipg", "per";
 		assigned-clocks = <&clk IMX_SC_R_CAN_0 IMX_SC_PM_CLK_PER>;
 		assigned-clock-rates = <40000000>;
@@ -427,8 +427,8 @@ flexcan2: can@5a8e0000 {
 		 * CAN1 shares CAN0's clock and to enable CAN0's clock it
 		 * has to be powered on.
 		 */
-		clocks = <&can0_lpcg 1>,
-			 <&can0_lpcg 0>;
+		clocks = <&can0_lpcg IMX_LPCG_CLK_4>,
+			 <&can0_lpcg IMX_LPCG_CLK_0>;
 		clock-names = "ipg", "per";
 		assigned-clocks = <&clk IMX_SC_R_CAN_0 IMX_SC_PM_CLK_PER>;
 		assigned-clock-rates = <40000000>;
@@ -448,8 +448,8 @@ flexcan3: can@5a8f0000 {
 		 * CAN2 shares CAN0's clock and to enable CAN0's clock it
 		 * has to be powered on.
 		 */
-		clocks = <&can0_lpcg 1>,
-			 <&can0_lpcg 0>;
+		clocks = <&can0_lpcg IMX_LPCG_CLK_4>,
+			 <&can0_lpcg IMX_LPCG_CLK_0>;
 		clock-names = "ipg", "per";
 		assigned-clocks = <&clk IMX_SC_R_CAN_0 IMX_SC_PM_CLK_PER>;
 		assigned-clock-rates = <40000000>;

-- 
2.34.1