Received-SPF: pass (google.com: domain of linux-kernel+bounces-213876-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Frank Li <Frank.Li@nxp.com>
Date: Thu, 13 Jun 2024 15:00:37 -0400
Subject: [PATCH v2 1/3] spi: fsl-dspi: use common proptery
 'spi-cs-setup(hold)-delay-ns'
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240613-ls_qspi-v2-1-b288f6f5b736@nxp.com>
References: <20240613-ls_qspi-v2-0-b288f6f5b736@nxp.com>
In-Reply-To: <20240613-ls_qspi-v2-0-b288f6f5b736@nxp.com>
To: Vladimir Oltean <olteanv@gmail.com>, Mark Brown <broonie@kernel.org>, 
 Rob Herring <robh@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.org>, 
 Conor Dooley <conor+dt@kernel.org>, Shawn Guo <shawnguo@kernel.org>
Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, 
 devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, 
 imx@lists.linux.dev, 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?cjlmQlN1UDZWcWJhY3FMamprWmoyZkwwdWxsbFVXNFh0Yk9rV0hNRGlvYThK?=
 =?utf-8?B?ZkJvYWRBdHVpSlNaMERqY1ZiOTdNWGlxc3NFeDJXRzV0KzlQYkNINVo3bWlj?=
 =?utf-8?B?R3pFOVVMK0xWN3pxOWF4MXJmRWU4TGd1NGxZVXMrdDJ2b0tzV3JtV2JjcXc0?=
 =?utf-8?B?Q1JxZHhlS1ZPYi81bk0xMk5YR3duN1hmZXpTbmxZQUJJYXpMN0hldHpMT1Fl?=
 =?utf-8?B?ZWxjYzhKbUlCQ2JnWnRNelE4ZGxpRm8xcnlvRWg3K3lSbWJJSSsyNHgvV0tW?=
 =?utf-8?B?U0pHZ1Q4TGcvNklqeFBqQjlnVmdaMXc3YkVFN2dDeTVib3dIUE91Mk5TVXFi?=
 =?utf-8?B?eEQzUUtmOFFBZGl4WFViUWFhYnZEUWFwNlhWeEtvajdrRU1XQ0dZQU5zdnh5?=
 =?utf-8?B?UFRtZzYxaVhiSnhsNXROQ2V2MXgrSFQ0dFlsczdoZ0ZsZGk2S2d3bFFCV2pO?=
 =?utf-8?B?dDF3YW5NQmhXd3NCTHprV25XZ3BoT3pzdmNxQlJSbG9sTFdxNStPUHBnUTNw?=
 =?utf-8?B?aU1HZHVkY25GaTZtRjltMVdFUlRUaElkU3ZES2xRQjZKaUY4aWpseDJZMHZP?=
 =?utf-8?B?WTFDREZuMFBnY1ZHelFkOTkvdldxemxEVmVqVGZoWjgzazAxbXRCenphc2tz?=
 =?utf-8?B?cVd5ZEJRazR0UXJ0UHRRZU9aSzlvQ0hTNGJBc0pEYlFxTVNRdHRLZU8xQWRi?=
 =?utf-8?B?SVdwWWo4Y3E2RmVuWVZwYXVqVjJ4clA4K29jdUNuVnZFeFVHVjVDZ2Q1aW1k?=
 =?utf-8?B?SCs4NkRObEg5RWR1VW5idjRZbmYzYkFnZm1HUjhiWXl4eGxoRU9RY0llNzJw?=
 =?utf-8?B?bk1TbWRrUkY5OUJLc3lGM2RCZTcweThFNWVndWJTTHN3RjllWExDazdBNHln?=
 =?utf-8?B?NWpIUlpseFpQVnFLWU9TV3p1d0U2dU01YUFKWnlIQkUxQUYyanYrOE0xNDlz?=
 =?utf-8?B?WTZweDk5dHZVWklBcnJuVFpxVGtpWEZMbFd3WG1UQzVjdk9sKzhOTTUyZlNq?=
 =?utf-8?B?TjBYSkRRZTV3RUdycGZFYUp6NmlobmV6TWhuek5TODFOSkY3LzRiNFducXUv?=
 =?utf-8?B?S1o0RXpqMkJKYWJoUVRCS0FxWFN1Z3lNeUx0amZkUmVRcFlJejRCL2t4SFRt?=
 =?utf-8?B?U243UGZKMjY5NnhzZGVzeGVlWVRvMGhkSzJVUVFBS01HQ3JsT2Vwc1hlSU9y?=
 =?utf-8?B?Z2JvaC9BQld1czJmdklzT3F4WnhWWnRIZHBHY1pBQytQNUVpTjhld1ZlNkg2?=
 =?utf-8?B?eWtUY2pqNDhhRjd6dnpvcW5iUkFobGl6WWs5RnVkOGZiWDhNR3ZmOVF6NVJo?=
 =?utf-8?B?RE5vRHovdW44azF2bFZ1RkxDdy9zNXpGZGVjRXVxbWN4WkxkKzZxS2JIR0Zv?=
 =?utf-8?B?MitWU2hxMExtMFUrSWVDNGpkclNHRE0zMWt4SmVQVzB3YUJpbG56Ukw4c1ha?=
 =?utf-8?B?V3R5bnlPclo2Z1RPMC9PWmhKanNsRUpYeThxUVB2V1NjRkp0YThyZ3lOSFIz?=
 =?utf-8?B?UzM5TFJpQ0RCdEMyb0tnM0FxUS8xYWZnWkcxY0ZSVHRPcit3WEtERkw1Ritm?=
 =?utf-8?B?VGhDZUZka1YzdmZ6cy84ZUFCYVpHdVNCa2RPZkdjM2kzSzlkeUtnSVB0SFdW?=
 =?utf-8?B?bHN2OVovZ28ySHFpMVM1bnJDTW5qUmJTK0lVTVRaWGVEYkVYNTlsQ1daZkhF?=
 =?utf-8?B?UlFHbFMwcitLTzNkNGJXOEloeEJLMm1FZVJWaTA1d2lQcGl2b0xudDFsSXow?=
 =?utf-8?B?Mk5TekorNWRmV1V2TlN3UGU0UmUwN1ZicllORXF4anJMZ1IwMjFidmxWcE9t?=
 =?utf-8?B?cXJDY0plWlhEamtwaiszOTZsTVVkNjdWUU1aa3hjeEc2WjQzUnlrbDlBSEpp?=
 =?utf-8?B?OW9JTkRoSzJHZ3R0ZHdUMDVZSmRpMzhzM20wSzFLQVprVER5YWMrOExEQksx?=
 =?utf-8?B?YWlRN2xsc2pMVEZIOHQzaU5laU9CeGtaWHJNSlFvNkJwdTByeS9VUHBpZk9r?=
 =?utf-8?B?QlF6SUZYRkV5NjJ5SHhwYWFJM1RNOXdhRURkMWJaTVdoWWJHN2xaTDBobVZq?=
 =?utf-8?B?eklHSmZuREdaWDJoNWd6bjZRMWJ2eDkzS0pqNEl0S1JtODdSZDJBUEFqNlZE?=
 =?utf-8?Q?vccA=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2bbb6667-33f3-4712-3bff-08dc8bdb274e
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2024 19:00:55.3959
 (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: Kf1yL1RFvoB0hR/Kk4y8+pNB/fuCK3X3KeZAPq3aiRICEjoa+uquSKOvPAmNtwJsm2Zs7SdAqtXqyd/EK0HJXA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9384

Use SPI common DT binding properties 'spi-cs-setup-delay-ns' and
'spi-cs-hold-delay-ns'. If these properties do not exist, fall back to
legacy 'fsl,spi-cs-sck-delay' and 'fsl,spi-sck-cs-delay'.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/spi/spi-fsl-dspi.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 0a2730cd07c6a..7c1f8af9d215e 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -1018,11 +1018,15 @@ static int dspi_setup(struct spi_device *spi)
 	pdata = dev_get_platdata(&dspi->pdev->dev);
 
 	if (!pdata) {
-		of_property_read_u32(spi->dev.of_node, "fsl,spi-cs-sck-delay",
-				     &cs_sck_delay);
-
-		of_property_read_u32(spi->dev.of_node, "fsl,spi-sck-cs-delay",
-				     &sck_cs_delay);
+		cs_sck_delay = spi_delay_to_ns(&spi->cs_setup, NULL);
+		if (!cs_sck_delay)
+			of_property_read_u32(spi->dev.of_node, "fsl,spi-cs-sck-delay",
+					     &cs_sck_delay);
+
+		sck_cs_delay = spi_delay_to_ns(&spi->cs_hold, NULL);
+		if (!sck_cs_delay)
+			of_property_read_u32(spi->dev.of_node, "fsl,spi-sck-cs-delay",
+					     &sck_cs_delay);
 	} else {
 		cs_sck_delay = pdata->cs_sck_delay;
 		sck_cs_delay = pdata->sck_cs_delay;

-- 
2.34.1