Received-SPF: pass (google.com: domain of linux-kernel+bounces-40435-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Farouk Bouabid <farouk.bouabid@theobroma-systems.com>
Date: Fri, 26 Jan 2024 18:27:45 +0100
Subject: [PATCH v5 4/6] serial: 8250: set rx-enable gpio state when rs485
 is disabled
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240126-dev-rx-enable-v5-4-5d934eda05ca@theobroma-systems.com>
References: <20240126-dev-rx-enable-v5-0-5d934eda05ca@theobroma-systems.com>
In-Reply-To: <20240126-dev-rx-enable-v5-0-5d934eda05ca@theobroma-systems.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, 
 Jiri Slaby <jirislaby@kernel.org>, Rob Herring <robh+dt@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Heiko Stuebner <heiko@sntech.de>
Cc: Rob Herring <robh@kernel.org>, linux-kernel@vger.kernel.org, 
 linux-serial@vger.kernel.org, devicetree@vger.kernel.org, 
 linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, 
 quentin.schulz@theobroma-systems.com, 
 Farouk Bouabid <farouk.bouabid@theobroma-systems.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?Yks5RWVoQ0NXNC90bHRWWGxlRTh0b2RxTlUzL2JVSmFveThUMmpnZGNoWWFn?=
 =?utf-8?B?N3hvbTRiaVhwM05GWmRubytvNVJKKzN0cTB5MFVYOHprdmwrUWlOZG5iQVEw?=
 =?utf-8?B?dHNTaDFhaERmaVJmV3hHaG11THpvVkVMd0I3anNoZElpYjZpcTFmbVJkdFFZ?=
 =?utf-8?B?UVI0Tys3R2dJSEQ0bHlMM0szL2o4ekdWL0ppZzZGSXpCZzNacmc5cmc5THE0?=
 =?utf-8?B?WFRMdFVBOFp4N2o1bEFKbGhDUG43MTZPNDFMSWNOVlVGcmtIOTUvRW0rREpN?=
 =?utf-8?B?MnNYTVhCbDI2bThWWUhubnNvRjljTlJ5TkRpOUorNG9RZ2puTmhCMGFCM1BV?=
 =?utf-8?B?VTBtQldTZjBISUhkQnJ3bk9LOU0zZHQwQklKK3ZHTm16MUVObDhxUmp0V1Fj?=
 =?utf-8?B?dEdxT25uSXBvWC90RHNrVkpiS0pUb0VLUGROaUVaWW5weFF1L05YL0xmN3ll?=
 =?utf-8?B?ZjRjWmZZVE94dlVjQ1hwNGMyeFRFWlRmRTVMQWtrQ3Z5ODFCR21rYmNFQmhk?=
 =?utf-8?B?ZDlyU2loOWgrL0xCenBTOG1uY1R2SFZuK3U4dXFZYnVDbStXMnpOb2tUNHE4?=
 =?utf-8?B?R3Z0NnJpR1VsN25DMjVsamdFS1RiZ2RZYkJ4RzFJaUczNVZ5dzcvNVZsU3o1?=
 =?utf-8?B?bi9pTEZNTTNTWFU0YjZGVVh5T002Ri9NSVJidDVDRHpVbktYTWRMRzNBeWw0?=
 =?utf-8?B?RWtkOHUwN1pRcExIRk5vTFJxa2wrMmdWbmxZYURmTDZHc3VsTEVaaEN3SzVC?=
 =?utf-8?B?azg3OEMzZ0JnZ0tISEQwQjZFRjZJM2RYb1hON2JYYWhSMzJCNGk4NjNnNk4w?=
 =?utf-8?B?UlUrakNXT3RwVGZXUDdMVG9Ed2ppazdwQ3c3QWxFRzNLaXo0ZDRZbnBxY1FL?=
 =?utf-8?B?ekk2c1ZNSVRXYlpMOEJXYWpRUVBvRXRHeGMrRzRneStxdzBoc2JWU2xQejcx?=
 =?utf-8?B?UnpZOExnVTVyVTVwMDcxYVdhTUgwRXM5ZTJ5QWRkQWhCb1Z2L2tiL1dXWVhJ?=
 =?utf-8?B?VVpMVlJmZjhUQlgxWHhvRUVoYTNMVU1BcEIxWXZseGtZY0xXLzg4SGF2RjVI?=
 =?utf-8?B?MkE3aElMTzdOa1RDaG45azlHTk5BQ2ZhT3BqWWNqRGgrZ1Qvc3lIbmdBQXhN?=
 =?utf-8?B?eGkvVjBiSlZVaHMzTVMvejZ2d1I2bHJFYlBHNGFKMG5ieVZBTGExVnNTSmsy?=
 =?utf-8?B?TUNBSW9uQUpTSlgvc2Z3R1Z3d3dtTEduNUJCK3dOVWk2dnRFaWliSGpBekdN?=
 =?utf-8?B?VUMzQnN2SHdvNTdOdHQ3Sko0dWtyZVU5Mm1iSW03Q2RTZUhHQ1hoL2JxWmdr?=
 =?utf-8?B?TTBsOEpOS0xvelVkMDZMM1c3Ylc3Nk1iRElOdzFBdlJGZUQ2MURqcmlyUDJB?=
 =?utf-8?B?a0RhOWl0UHgzOU1ES3VNTW9nanE2OEp4MlZmT0FsTEVNaWZnYlhmc1RRMlR6?=
 =?utf-8?B?WnhDaVp3NHh6NHg5R09POFpTWi9Da1JVWU80cGU4K3NCTzZYMjJReEF6SXo5?=
 =?utf-8?B?bGFLZnRNampGeHpkanBRT2RMeC8vYXp3YVBCN0IvejRlVFJuK1JrUi9Zcmlm?=
 =?utf-8?B?YkpMNnp0SUIycWFZNGhlS0ZwN0JVbVRDalRzNG5SNlFoVUxBR3VLck5zanZJ?=
 =?utf-8?B?UUMxNVkwaDJRSDZDNmtKeTVpUk1xUWk3MUUxY0RCelVMZzFRRTlwclJxVFU4?=
 =?utf-8?B?MFEyUHlEdjd2emRhSW82cm5BQU9hUDlZcTZ6ZVJ3aHNLSDFQU0lyZWdsempz?=
 =?utf-8?B?ZnNibXZDMm50TkFONnFYRUFLRkF4dHBucXNBcWRoeHVTUGZwR0pLRDJEdG5w?=
 =?utf-8?B?dHJHZUZVdk5ENkIzNXg5aXJXREw0UFAyQUVUVnJqTjhMcEJQM0RiOFJuSU9F?=
 =?utf-8?B?RUFLcW5HSVZjeFZTWXByZUZTeVRzbGtnNVN0M1RlTUt2aENvaXU2eldHQnEw?=
 =?utf-8?B?UTlxU1UySjRnLzJ5aVZzNXI0bVdRMk93Z3pYZy9uQ0ZncDBTZXRPTUJBd1hh?=
 =?utf-8?B?a3ZoM2Y5ZUNPNi9YNXVMZExNWHRocHErTGJhNjFyN2s3NW16QU5JRkxldDh6?=
 =?utf-8?B?MUpVTUx2UldSMUdzTEdRVG80SmEyTmVXanNmTDBBaW16b1dlZHB4RXFhY1ll?=
 =?utf-8?B?bkJDbkorQ3ZuSTVuWm81a0RMRVNyeVZYME9iMm5icTF3ZjdtZVByeUdOUjJP?=
 =?utf-8?Q?Sj9E76MgDagUlVgqzlGblEo=3D?=
X-OriginatorOrg: theobroma-systems.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 304068e2-a041-46b0-d5d1-08dc1e943a44
X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6382.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2024 17:28:36.2306
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 5e0e1b52-21b5-4e7b-83bb-514ec460677e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: svuCXIXvdO8RLh0wz1RLk+l8SHeqGUJ0lyzbJ3/mS8V9tShn+ziAKvmiYVFWvvXRvtog6mOwWdA6Bcc1N0D6vhoLgIasNcDLdg0WQnOVftg6YA6kfoYvT3JlC3ZM9hRc
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820

Add the possibility to de-activate rx-enable gpio when rs485 is disabled.
This defines the state of RE or DE/RE signal when em485 is disabled.

Signed-off-by: Farouk Bouabid <farouk.bouabid@theobroma-systems.com>
---
 drivers/tty/serial/8250/8250_port.c | 4 ++++
 drivers/tty/serial/serial_core.c    | 6 +++++-
 include/linux/serial_core.h         | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 54d8f809b81e..fbd0212d2397 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -582,12 +582,16 @@ static int serial8250_em485_init(struct uart_8250_port *p)
  */
 void serial8250_em485_destroy(struct uart_8250_port *p)
 {
+	struct uart_port *port = &p->port;
+
 	if (!p->em485)
 		return;
 
 	hrtimer_cancel(&p->em485->start_tx_timer);
 	hrtimer_cancel(&p->em485->stop_tx_timer);
 
+	gpiod_set_value(port->rs485_re_gpio, !port->rs485_re_gpio_inactive_when_rs485_disabled);
+
 	kfree(p->em485);
 	p->em485 = NULL;
 }
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 8067d20c5275..abcba88dd5a7 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -3663,7 +3663,11 @@ int uart_get_rs485_mode(struct uart_port *port)
 	if (port->rs485_rx_during_tx_gpio)
 		port->rs485_supported.flags |= SER_RS485_RX_DURING_TX;
 
-	port->rs485_re_gpio = devm_gpiod_get_optional(dev, "rs485-rx-enable", GPIOD_OUT_HIGH);
+	port->rs485_re_gpio_inactive_when_rs485_disabled = device_property_read_bool(dev,
+		"rs485-rx-enable-inactive-when-rs485-disabled");
+
+	port->rs485_re_gpio = devm_gpiod_get_optional(dev, "rs485-rx-enable",
+		port->rs485_re_gpio_inactive_when_rs485_disabled ? GPIOD_OUT_LOW : GPIOD_OUT_HIGH);
 	if (IS_ERR(port->rs485_re_gpio)) {
 		ret = PTR_ERR(port->rs485_re_gpio);
 		port->rs485_re_gpio = NULL;
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 364583203a24..fa5a92b56360 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -585,6 +585,7 @@ struct uart_port {
 	struct gpio_desc	*rs485_term_gpio;	/* enable RS485 bus termination */
 	struct gpio_desc	*rs485_rx_during_tx_gpio; /* Output GPIO that sets the state of RS485 RX during TX */
 	struct gpio_desc	*rs485_re_gpio;		/* gpio RS485 receive enable */
+	bool	rs485_re_gpio_inactive_when_rs485_disabled;
 	struct serial_iso7816   iso7816;
 	void			*private_data;		/* generic platform data pointer */
 };

-- 
2.34.1