Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sherry Sun <sherry.sun@nxp.com>
To:     gregkh@linuxfoundation.org, jirislaby@kernel.org,
        philippe.schenker@toradex.com, ilpo.jarvinen@linux.intel.com
Cc:     linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-imx@nxp.com
Subject: [PATCH V2] tty: serial: fsl_lpuart: use UARTMODIR register bits for lpuart32 platform
Date:   Fri, 14 Apr 2023 10:21:11 +0800
Message-Id: <20230414022111.20896-1-sherry.sun@nxp.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T1FOcDE3MGtTNk1hbDRrQnFSeG1RRVgvN1UyRUZ1YXRrd2p5dW1aekpqQjRW?=
 =?utf-8?B?NEVzRFRvamlGTU1VSGdvQjRYZWY3bkN5b2FVZ2x5eE9hTDdwR0lsall4UUI3?=
 =?utf-8?B?Z3JOWFk5cFdNYzdHTm5ET0FKZzRrc21TR256eWxXSU9OR253SzlrYjk5M1dB?=
 =?utf-8?B?VGhDK2R5UGZPTGYyRjNQeVJ6b1M5c1BlVmlUMFRkbVhXVkg5QlJqRmx2U2o5?=
 =?utf-8?B?cTRlcWZpaTJWSVZWRkVvZElKZDVrK0xjQkFqbFNoL1RIdzJhYnZYSm5TcWls?=
 =?utf-8?B?TEdacHpiOEhadkdaQVpnNTBYRUkvaTFYRFAzelZBNTJqRTU3OHlqUGtwK1dU?=
 =?utf-8?B?SUhyZ1VJT3ZiVDRLT2l5dXh0OW1OT1daK1hkeEV4blpCZFg5aTBHeEV6VEQv?=
 =?utf-8?B?QjZ1SDBBY2RkcnVSWDN3VUlIUHdvU0FTKzhGS1FNalZ2U3ZxTXlwZk1LU2RT?=
 =?utf-8?B?R1doaHBBYXBhTVMzV0pSZEV1ZHRmbW5ORzJMMkx4ZGV1ZEw1enovcFU0MWEv?=
 =?utf-8?B?VTZIZXZHcFNWQnRxMC9TYkN4YjVDbjh3cCsvU1B4ZTdvVnNMNjlnSTF2dFQx?=
 =?utf-8?B?T1puZThtTjNRVGRObStEaEwwV2ZOZFpqMGdWdTFuS0s3eGtsRm5ZN1luaXJF?=
 =?utf-8?B?a1RVbGx1RXFSTWw0Qlk1TmxWM2JPRDZ4NXNRbFR5aTVjcmI2eWZwZE1KQnJl?=
 =?utf-8?B?UlVLMSt5TVF2YXk3Q2lKQVVXb0J1ai9INnZHd3I4VjZMOElNRXVoajJ6SU90?=
 =?utf-8?B?cS8xUmgzUk9FYmJ5bXJUU1BWdUFjYmNkYVEraHgycG9RWHZXck9FY3JYbHlG?=
 =?utf-8?B?M1JOUGkzK0xkSndsUHdyaERQT09NYVQ5REp4bTBxR2oydGRTdEptL0RFc2hq?=
 =?utf-8?B?bEIxQ05HMnl2ang3YTRCaXhlVElvOVo3MHNWT1p3QzFLK3E3a0svK1AxSFNv?=
 =?utf-8?B?NGp2RHdyc0tzTUtzazI2RWs0eDVkZnVkc2RNK3J0d3VKVlV0U2ZxQ1k3Z3Zz?=
 =?utf-8?B?bHNZRDFudENEOWd0OWgyWkNPSVBOS0dwdlFIZE9mNnpTSktUQVpaTGpUdHdI?=
 =?utf-8?B?dnhWUWNqWnFZclJWWUpaTVR0Q3ZqQUlEVUZWM21vS1pNR1d4ZTI0SE5oL0J4?=
 =?utf-8?B?TmdqTGtxckNOaDlhMkFCbVJGS29oSDZuVFcyUE9haFRwUHdkUk0yWmJRMk1o?=
 =?utf-8?B?LytjclRueGVoY25Xd05iVlB1NWtYS1BjKzgxSUZoNFlSbGF1bUw5RjVRU0Z3?=
 =?utf-8?B?cVhlVDlLbjVtbDhxNk9XSE5UTEZTcWlRWG5SRUdtZUs0Zkx0QWdEK3gwR3BB?=
 =?utf-8?B?ME9ZRk5lMGhBSEprMVF4d1FtaEFVOFVQQUFnMUJremNzaHVWTkVKa00rRmF1?=
 =?utf-8?B?bW1LdFdFTVYvZHRnQnl1dS8yR21ZcU1kWHpUWVJ1bkpsYUZBT1pXUTNrQVh4?=
 =?utf-8?B?RXJwTHh0WjI5YVkwNzVJSXFLczgyRjV2WkNKdEgzYTQwMU1abE9zaldUVmFL?=
 =?utf-8?B?cnU2UEdCNE4rQzZ4ekcvRmJCSGlPVlBmQjN2cHRBVTN3a2pNb0ZrbDVVRms3?=
 =?utf-8?B?T2ozN0ROYUxabVRJRmxicTZNZG9ickp2YjcxRmJSWGZBTG0zazBXTjF3ay9K?=
 =?utf-8?B?Z3JxbGtZZnJJTVY4MjAvSVBxR2o3Mm1NN1BDcXk1eUxmWm5Ka3dnYUdTS2Ew?=
 =?utf-8?B?ekdRQ1hlQmwrZ25kQlVYVEJpdk9kcmc2OFU3Z2ZQTVlLeHFOQmZxbm90eXpZ?=
 =?utf-8?B?T1hHMjRMcXlkRzBEUHRJblhES1ZtTi9MTUVnSkdnZU5UUmNrdGxxMmRBd1d0?=
 =?utf-8?B?bGIyWG96YUIzdkpObzRmTUl4c3ZoY2dUVy80cVgySVlBMmxmRHRhUG01QTdv?=
 =?utf-8?B?dk8waHJQM2RiTCsvZGdhR1RFeWVBSFJGODc3bUFmM214QU1FU3l1TXFXbHJk?=
 =?utf-8?B?bnhCZ2RhOUpBald4TDk5d1RZTDZiKzUxWUVNYTB4WmFseCszZ21WM0FrV2pr?=
 =?utf-8?B?UHF4eXNkMDU0Z0UzNDF2TUsyQUJiNzJpbUVWTytmODhjV3VKOTk5N1c5b0pz?=
 =?utf-8?B?U0VxaElPVExIVkxQTmY4cjVDejRod1lvU2N2aFhMamRYVFBoQVVCcXhOYXp0?=
 =?utf-8?Q?H5bmfOpKZEi/IsyQwXPSuzHdN?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 961ff1bf-2a83-4699-d741-08db3c8f6d5d
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 02:24:51.7743
 (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: VWxapn1VdtvnFthwawTiPTkIfmDX5kQht2dj29cFXtNrezK5o02gA0NCfZEgGuFfC7gazBZ+qDlc3cG0UT2ROQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7399
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

For lpuart32 platforms, UARTMODIR register is used instead of UARTMODEM.
So here should configure the corresponding UARTMODIR register bits to
avoid confusion.

Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
Changes in V2
1. Remove the fix tag.
2. Add Reviewed-by tag.
3. Improve the commit message.
---
 drivers/tty/serial/fsl_lpuart.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 074bfed57fc9..9845d3f5b84b 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1406,12 +1406,12 @@ static int lpuart32_config_rs485(struct uart_port *port, struct ktermios *termio
 			struct lpuart_port, port);
 
 	unsigned long modem = lpuart32_read(&sport->port, UARTMODIR)
-				& ~(UARTMODEM_TXRTSPOL | UARTMODEM_TXRTSE);
+				& ~(UARTMODIR_TXRTSPOL | UARTMODIR_TXRTSE);
 	lpuart32_write(&sport->port, modem, UARTMODIR);
 
 	if (rs485->flags & SER_RS485_ENABLED) {
 		/* Enable auto RS-485 RTS mode */
-		modem |= UARTMODEM_TXRTSE;
+		modem |= UARTMODIR_TXRTSE;
 
 		/*
 		 * The hardware defaults to RTS logic HIGH while transfer.
@@ -1420,9 +1420,9 @@ static int lpuart32_config_rs485(struct uart_port *port, struct ktermios *termio
 		 * Note: UART is assumed to be active high.
 		 */
 		if (rs485->flags & SER_RS485_RTS_ON_SEND)
-			modem |= UARTMODEM_TXRTSPOL;
+			modem |= UARTMODIR_TXRTSPOL;
 		else if (rs485->flags & SER_RS485_RTS_AFTER_SEND)
-			modem &= ~UARTMODEM_TXRTSPOL;
+			modem &= ~UARTMODIR_TXRTSPOL;
 	}
 
 	lpuart32_write(&sport->port, modem, UARTMODIR);
-- 
2.17.1