Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2419246pxu; Fri, 18 Dec 2020 12:49:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkVT207TArr28pzvfC3zL1ThTkj8hfxt3yRy8L3sZVI47vd1Mt0rJTshzhl37o81x0e6Iy X-Received: by 2002:a17:906:e247:: with SMTP id gq7mr5890681ejb.27.1608324545462; Fri, 18 Dec 2020 12:49:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608324545; cv=none; d=google.com; s=arc-20160816; b=vfSXAZk5er4s/SYi/KyL4knEPc078iEK+zaMbbnKw/D3qKlO/M5rf8OyEoXTKbk5tm hVzWpEvEkAfcGc5EBawqvyFpQ3F4Cyx0EtDkmoi6kkrv1Tjkw8eQBtdIYIhQ82d8Mh0m 3xbgqxXPYi1bYX5T8MxFNClv5FnSNbmIlEyWINAzzRCtKPRh/C7+gPWXUyYNZspTT5MX gDxlaNKWQCpWH7rweRxiiByf0kxWwz53ZGb3Zq+sDUtUUeelfcEHJsPy90RpRtJWLpAk 8Kx+oXce95QzN+pFwZdX3evYdp4OEe6khtI19GVCx3KfauWZs1+KhaOFoS+83GWaykKT +0Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=2ac0OtE21/ui4wlzt7Dk2cdhdVHiNUCF8D7wYErCU0g=; b=Ah1J7iCjsDvvOusTrYBMH17vRY0QK1WZRgYcztLaJUoVJ2nAgeojOCT7IQaLBWRo9G suBRwaswzA8KngmoC/TGVlIdK4sJtTDqu1JyNtSDI5A5NZ17HFNFvN9BiDsyn5SYcLnP TshBzxoxEqPpgkjDE9Oaki0YMpvtftj7mgK07K3FuAIEPuAwXqMtWUaRCasf5ZwVCIKh w7dqE3SnKhmZ74nV8Tc52dsUHSbVc8MV40fS0nLGvmrbrg4JxCmIyBAS7R5pUxvIEmx3 4AD5F+MWgKxdVXhJJ2Pl4bsXiFU+Pg12zPPP67CvtkGPADYWEezLz1X8QvSsSxGQNTqz POTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=3rKZTa32; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foss.st.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn16si6179114ejc.482.2020.12.18.12.48.42; Fri, 18 Dec 2020 12:49:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=3rKZTa32; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foss.st.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733042AbgLRTBq (ORCPT + 99 others); Fri, 18 Dec 2020 14:01:46 -0500 Received: from mx07-00178001.pphosted.com ([185.132.182.106]:43715 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726487AbgLRTB2 (ORCPT ); Fri, 18 Dec 2020 14:01:28 -0500 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BIIv1Ge013340; Fri, 18 Dec 2020 20:00:31 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=selector1; bh=2ac0OtE21/ui4wlzt7Dk2cdhdVHiNUCF8D7wYErCU0g=; b=3rKZTa32DfFuXBAhhVyQ6HI/7rVojJXWfFSR/OC5kKK4yzrkXOC6zNeoefFd8UUC7HJ4 QAV5VUmr6ByOgpGTjj0ojVdX9QQWE7c6OpUQ6mBdIUsjGAUEmNsFAlXXQbMftb5cVpfp E66HJYKyiZKgO7sWklyr/PzW3hNC6z2yc3BzvUauGtOcLk3DWw+G6JB7TXaYsaV4LeBm MvGx3/PEytXhQjD97CmDuLUmjPg2j190hGUDK0ejEpG1TFsv1pb1OcbxOwEm+VoMMnLK 76CwKaNzMwCGFZWzwLYAs5B+BrvEs09n20q1KZGydPBLDrA1NoeBET3w/hCtO6zsrT5u fw== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 35cptdqw8x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 18 Dec 2020 20:00:31 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 8AA03100034; Fri, 18 Dec 2020 20:00:31 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 7D07E228601; Fri, 18 Dec 2020 20:00:31 +0100 (CET) Received: from localhost (10.75.127.48) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 18 Dec 2020 20:00:31 +0100 From: Erwan Le Ray To: Greg Kroah-Hartman , Jiri Slaby , Rob Herring , Maxime Coquelin , Alexandre Torgue CC: , , , , , Erwan Le Ray , Fabrice Gasnier , Valentin Caron Subject: [PATCH 6/8] serial: stm32: update conflicting RTS/CTS config comment Date: Fri, 18 Dec 2020 20:00:17 +0100 Message-ID: <20201218190020.1572-7-erwan.leray@foss.st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201218190020.1572-1-erwan.leray@foss.st.com> References: <20201218190020.1572-1-erwan.leray@foss.st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.75.127.48] X-ClientProxiedBy: SFHDAG1NODE2.st.com (10.75.127.2) To SFHDAG2NODE3.st.com (10.75.127.6) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2020-12-18_12:2020-12-18,2020-12-18 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The comment for conflicting RTS/CTS config refers to "st, hw-flow-ctrl", but this property is deprecated since the generic RTS/CTS property has been introduced by the patch 'serial: stm32: Use generic DT binding for announcing RTS/CTS lines'. Update the comment to refer to both generic and deprecated RTS/CTS properties. Signed-off-by: Erwan Le Ray diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index 938d2c4aeaed..0d6c7f3375f0 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -1031,7 +1031,10 @@ static int stm32_usart_init_port(struct stm32_port *stm32port, goto err_clk; } - /* Both CTS/RTS gpios and "st,hw-flow-ctrl" should not be specified */ + /* + * Both CTS/RTS gpios and "st,hw-flow-ctrl" (deprecated) or "uart-has-rtscts" + * properties should not be specified. + */ if (stm32port->hw_flow_control) { if (mctrl_gpio_to_gpiod(stm32port->gpios, UART_GPIO_CTS) || mctrl_gpio_to_gpiod(stm32port->gpios, UART_GPIO_RTS)) { -- 2.17.1