Received-SPF: pass (google.com: domain of linux-kernel+bounces-150962-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Fri, 19 Apr 2024 11:37:04 +0800
Subject: [PATCH v2 09/12] arm64: dts: imx93-11x11-evk: add different usdhc
 pinctrl for different timing usage
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240419-imx93-dts-4-13-v2-9-9076e1d7d399@nxp.com>
References: <20240419-imx93-dts-4-13-v2-0-9076e1d7d399@nxp.com>
In-Reply-To: <20240419-imx93-dts-4-13-v2-0-9076e1d7d399@nxp.com>
To: Rob Herring <robh@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.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>
Cc: devicetree@vger.kernel.org, imx@lists.linux.dev, 
 linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, 
 Peng Fan <peng.fan@nxp.com>, Luke Wang <ziniu.wang_1@nxp.com>, 
 Haibo Chen <haibo.chen@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|AS8PR04MB8802:EE_
X-MS-Office365-Filtering-Correlation-Id: 61a58b4e-3c66-48be-e434-08dc6020f608
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	IqzRbTVZ+qHs1E2GtPi9dURk+W98qMZ66aDGU0vKd9YesXqIxrd7IYNtdVLy6xtToNYnNhhBUeqrUY2ztCpRWnq0Bw67yEMd3eKdwnFJ1AYzRE8Un20neX5aAAo2t/XLrweUt8G53LDq50sTuwhKjNEzBBqkTcxmSdHtZR7IaRY+sLTNX44jAXHx8PJywXpwVKH2Kb2LEO7PglbBDk0FpIi5wXjKNm4f5UeLhiUrS7YCUlRGQnzWnH5UQhdI0vYLuOf2i1K7kJDiA6EZVPQCBbOGPl2gBi2dVL2gdCYw2TkJjHpCUMYHicrOvghI9/3fDwbzh1M14wAJgM63xb7FZdG0mjuKcMOK6+dp8qkPwofYZJjVPfSa+eWlKn2UafYPzCrZfTT4yFFoEYaBDtZhLNGJXTgdSiNyzzUXZFozdf7eeG9ZBxE2Mlj5G6IJXzy6oKGARk3Jx3cTy1zYLeMzf5u8a8QEYBZwTia21Pa9++de/9jNFS2yCTJ1K6aJ31h8tkmE25RY0SQBSxWR79zBN14sAAAAxBS0nUJUoWpGsYQRZwyEXxfTna9aAXFC4mD5trQIOELPABY9xfvqz06iECoc73S6G0nJawwDZ6qjUMhofLR4EunPs9rmYot1ZiIarEAFTZVc3xAXKXMi+dR9Cmq8fXmfNFjA1gWMOxi0eYpg8sSTH2+Nd3tYEQFA+OBoYZmHOhonkWqLyi3nW2xEeu9QBAFEqiA4CJyhiqEupDs=
X-Forefront-Antispam-Report:
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(366007)(376005)(7416005)(52116005)(38350700005);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?M3A5bkE1eU1RRUdCQTdHcXQzOS9udGY5cFNhQXZqZ3cwRGU1aERweCsxaURk?=
 =?utf-8?B?RTEvQ0ZYWUZzV0NkN09zZ3lLZGNBTjg5OWtYbURqYW56eTRSRTJjYWxwbld1?=
 =?utf-8?B?cTFZMElQcDh2K091SUM2U3RsNlhZbWJ0UG1ZMHI0c1EzNVNzM1lZdDUyOXBM?=
 =?utf-8?B?SFV2K0ZRUkt0b2ZRQm94bXQxODlKeldKRHFWdEZqUU4zbERGcU5kRTNZY3FB?=
 =?utf-8?B?M3k3Ri96anFSMzF5YUtET2hUc2tUYzZPQ1UrNWgyNCtSRWtHalo5MmRxc3Ey?=
 =?utf-8?B?ZkNNeUNNQVl6WHJiYUlQQnlSV0Z1aEs5UzhNeWJxYTM2TWVVRkVhN2thVWxE?=
 =?utf-8?B?Z1FlU3Rvdmt5azRldjB3emduOHJGNlp5WU9NY0V2TGtIZklMd3M3YUNJcDcw?=
 =?utf-8?B?SjRrNTdVQkVnU1JFOFVkV1lOMnJGU3VRUnFhbU9SQXB1S2cxMU5qMCtiUEhw?=
 =?utf-8?B?OE81dWs3WFMzYzJmVkhEMkl6Rnk3bkZZaWNrWWRpRWZUdFFNbVloZmQvdVB0?=
 =?utf-8?B?K3lJTjNVcjJHU0J4K3JzdVZBM2F5dVhwaTJYazMzNmxCc1JaVjhETmFOaTN5?=
 =?utf-8?B?SUxPNThRSFJYeGtWYlppc2V0eFh1MXhNSHBnaGpNYnJPSU96REIrL20waTRW?=
 =?utf-8?B?ajV5OXlnWWJ4QU92Yy9ETjlmWUJITmkvU25UYXFjRHdZTFRadUVoYnZKSEVx?=
 =?utf-8?B?eW8xSkNIRzBBbDIxK0VzRUMvWldHZ0NMZjZFendBWE0veERTWnVzaU9Lcnd4?=
 =?utf-8?B?T0xZSlk2NlVxNTcwTnNXV3g3b0xwamhKMVcvT3A5TENJM0s4ZmNZbzc5MjVT?=
 =?utf-8?B?NUxkS3diU0VoTlp3ZDF3NkVHdExiWi9md1hDSWphdGF3Tmh4NkdwVFJEK1Vp?=
 =?utf-8?B?WVNzS0IraTRKV2wvb2M0QUhhbWlTWFY4RnlKNWl2MEFWbTFJTGhycVV3Q01j?=
 =?utf-8?B?VG5pMXdiQXJ0cEN1OXJoc3hlTk1IUVhaTlhXNmIrakY4MkFHWmt5UHdVR3ZM?=
 =?utf-8?B?UTYva0QzQ1pleU9qbWdpZ1pCS2dqZitCd0lKdzdibU1QSjNYV0xHOFF0ejdW?=
 =?utf-8?B?a0RjYWxUK3NtQ052SzVjNnFXZTdENWFRUTFhQ1J1cm5kS3c4T1NSYXlubEp4?=
 =?utf-8?B?RnNaK0c1dU93QnVhK0prV1R2OVBPV1RVUldkQWpINERnRVBsc0tyMVVYQU9q?=
 =?utf-8?B?WUFiUDl4MTZWNm5FZ29GaTVFUTQ3UUJXSGdaeTgwcUJCK3lEcTJwRlVucWRF?=
 =?utf-8?B?c2R4Z2hBeEJYeTV5b3ltdE4zc0lZNG9FdHJySmlKRmZaOVV6QTB4UXVTOUJo?=
 =?utf-8?B?V2tTYUU1a2wrNFFZT1V3SUJHbWUzK3lBeHBxYVhpc3lOWnFCcksvK3hpNFdu?=
 =?utf-8?B?S3JMdVRiUGs0bEh5S3IxRlBmdDk2TWJDOVhHdUdHZEVURUJYdVZnUmxOYjRV?=
 =?utf-8?B?MzM0b056OUx4TkFvOHIxdjh1SHhwdi9ZNncwdmIvRzhQV0QveWhpMndPdmt6?=
 =?utf-8?B?Y1lMUXBkM3JjMlNoOU00Rk8rR0FZcHVnc1dSMk1MM1pMd1VqNHpjaHg1RXJE?=
 =?utf-8?B?QTdTOEl3UHRrSytNY1EyQ1FySlBYaWdCclpKcUp0UlB6TDVlYmNQMEhibFR6?=
 =?utf-8?B?cDNLdHJESDF6LzgxZGtuQis5clVmWnlrRGdyRXZTSzFHSUUrdTZyeUlLcFhs?=
 =?utf-8?B?V2ZoeCtwTHV1c0xmM0F6ZEdFcmpiUkd4K2xFamZ3MFRvOVVYOXlxSy9EaHg5?=
 =?utf-8?B?QllQUXZMcmw2REJFZFV6cTVaZEI3K1AvTFptSllsVWFTdFNHaSszQlRxMmQ2?=
 =?utf-8?B?WlJYWTIvbEhRZ0Uyem0wdG1uQXZCeVpaQld4M3lBY204VDFnbmlqcUdYT2xD?=
 =?utf-8?B?bGhMdjFHbmJUc0p0cW9zY2pheFFHQXhCN3JpbGhXZzI3bkRTLzhDWEcvRmFB?=
 =?utf-8?B?bVNyZDIvbndQUUlkMWdsOHF3S0t0SjRPR3JGVTBRV2tXQTNLT1dkUDRSUkIr?=
 =?utf-8?B?VVR3bnJFOFdCaVZpdFdocWlsZWZBMGVQVS95QWN3azNkNytBNTJYcng4RjVx?=
 =?utf-8?B?QitqKzBDOHh6b1FSOGROTjFLRnNiYVQxNVErYzFtVm52Z1hkbXp6c1N6TjB6?=
 =?utf-8?Q?d0O5LcHI+1oaoBB+pyXTQxqlX?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 61a58b4e-3c66-48be-e434-08dc6020f608
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2024 03:29:46.3798
 (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: RIUCpTr3/wgYRYkexxY2E/stTSrgTH6ePIZI58a0c4SGCauO/N5M2/Kf2BrYZr84ZuXo2C8TXkDuXjxZoVfL0Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8802

From: Luke Wang <ziniu.wang_1@nxp.com>

imx93-11x11-evk dts use the strongest driver strength for
default(high-speed), 100MHz(SDR50/DDR50/DDR52) and
200MHz(SDR104/HS200/HS400) timing. To make usdhc working appropriately for
each timing, add X1 drive strength to default timing and X3 drive
strength to 100MHz timing.

Reviewed-by: Haibo Chen <haibo.chen@nxp.com>
Signed-off-by: Luke Wang <ziniu.wang_1@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 68 +++++++++++++++++++++--
 1 file changed, 64 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
index 2b67724db685..f848cb0922ef 100644
--- a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
@@ -161,8 +161,8 @@ &lpuart5 {
 &usdhc1 {
 	pinctrl-names = "default", "state_100mhz", "state_200mhz";
 	pinctrl-0 = <&pinctrl_usdhc1>;
-	pinctrl-1 = <&pinctrl_usdhc1>;
-	pinctrl-2 = <&pinctrl_usdhc1>;
+	pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
+	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
 	bus-width = <8>;
 	non-removable;
 	status = "okay";
@@ -171,8 +171,8 @@ &usdhc1 {
 &usdhc2 {
 	pinctrl-names = "default", "state_100mhz", "state_200mhz";
 	pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
-	pinctrl-1 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
-	pinctrl-2 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
+	pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>;
+	pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
 	cd-gpios = <&gpio3 00 GPIO_ACTIVE_LOW>;
 	vmmc-supply = <&reg_usdhc2_vmmc>;
 	bus-width = <4>;
@@ -391,6 +391,40 @@ MX93_PAD_CCM_CLKO2__GPIO3_IO27			0x31e
 
 	/* need to config the SION for data and cmd pad, refer to ERR052021 */
 	pinctrl_usdhc1: usdhc1grp {
+		fsl,pins = <
+			MX93_PAD_SD1_CLK__USDHC1_CLK		0x1582
+			MX93_PAD_SD1_CMD__USDHC1_CMD		0x40001382
+			MX93_PAD_SD1_DATA0__USDHC1_DATA0	0x40001382
+			MX93_PAD_SD1_DATA1__USDHC1_DATA1	0x40001382
+			MX93_PAD_SD1_DATA2__USDHC1_DATA2	0x40001382
+			MX93_PAD_SD1_DATA3__USDHC1_DATA3	0x40001382
+			MX93_PAD_SD1_DATA4__USDHC1_DATA4	0x40001382
+			MX93_PAD_SD1_DATA5__USDHC1_DATA5	0x40001382
+			MX93_PAD_SD1_DATA6__USDHC1_DATA6	0x40001382
+			MX93_PAD_SD1_DATA7__USDHC1_DATA7	0x40001382
+			MX93_PAD_SD1_STROBE__USDHC1_STROBE	0x1582
+		>;
+	};
+
+	/* need to config the SION for data and cmd pad, refer to ERR052021 */
+	pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp {
+		fsl,pins = <
+			MX93_PAD_SD1_CLK__USDHC1_CLK		0x158e
+			MX93_PAD_SD1_CMD__USDHC1_CMD		0x4000138e
+			MX93_PAD_SD1_DATA0__USDHC1_DATA0	0x4000138e
+			MX93_PAD_SD1_DATA1__USDHC1_DATA1	0x4000138e
+			MX93_PAD_SD1_DATA2__USDHC1_DATA2	0x4000138e
+			MX93_PAD_SD1_DATA3__USDHC1_DATA3	0x4000138e
+			MX93_PAD_SD1_DATA4__USDHC1_DATA4	0x4000138e
+			MX93_PAD_SD1_DATA5__USDHC1_DATA5	0x4000138e
+			MX93_PAD_SD1_DATA6__USDHC1_DATA6	0x4000138e
+			MX93_PAD_SD1_DATA7__USDHC1_DATA7	0x4000138e
+			MX93_PAD_SD1_STROBE__USDHC1_STROBE	0x158e
+		>;
+	};
+
+	/* need to config the SION for data and cmd pad, refer to ERR052021 */
+	pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp {
 		fsl,pins = <
 			MX93_PAD_SD1_CLK__USDHC1_CLK		0x15fe
 			MX93_PAD_SD1_CMD__USDHC1_CMD		0x400013fe
@@ -420,6 +454,32 @@ MX93_PAD_SD2_CD_B__GPIO3_IO00		0x31e
 
 	/* need to config the SION for data and cmd pad, refer to ERR052021 */
 	pinctrl_usdhc2: usdhc2grp {
+		fsl,pins = <
+			MX93_PAD_SD2_CLK__USDHC2_CLK		0x1582
+			MX93_PAD_SD2_CMD__USDHC2_CMD		0x40001382
+			MX93_PAD_SD2_DATA0__USDHC2_DATA0	0x40001382
+			MX93_PAD_SD2_DATA1__USDHC2_DATA1	0x40001382
+			MX93_PAD_SD2_DATA2__USDHC2_DATA2	0x40001382
+			MX93_PAD_SD2_DATA3__USDHC2_DATA3	0x40001382
+			MX93_PAD_SD2_VSELECT__USDHC2_VSELECT	0x51e
+		>;
+	};
+
+	/* need to config the SION for data and cmd pad, refer to ERR052021 */
+	pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
+		fsl,pins = <
+			MX93_PAD_SD2_CLK__USDHC2_CLK		0x158e
+			MX93_PAD_SD2_CMD__USDHC2_CMD		0x4000138e
+			MX93_PAD_SD2_DATA0__USDHC2_DATA0	0x4000138e
+			MX93_PAD_SD2_DATA1__USDHC2_DATA1	0x4000138e
+			MX93_PAD_SD2_DATA2__USDHC2_DATA2	0x4000138e
+			MX93_PAD_SD2_DATA3__USDHC2_DATA3	0x4000138e
+			MX93_PAD_SD2_VSELECT__USDHC2_VSELECT	0x51e
+		>;
+	};
+
+	/* need to config the SION for data and cmd pad, refer to ERR052021 */
+	pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
 		fsl,pins = <
 			MX93_PAD_SD2_CLK__USDHC2_CLK		0x15fe
 			MX93_PAD_SD2_CMD__USDHC2_CMD		0x400013fe

-- 
2.37.1