Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp947159pxu; Wed, 6 Jan 2021 08:26:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAhJoVe9bRpy//mcXPE4jQI3Q9D3L8y2nT/KVYdY7wwaeq/1vkkEV9g9BnnSRaPFrUQhsp X-Received: by 2002:a17:906:b002:: with SMTP id v2mr3459711ejy.531.1609950375583; Wed, 06 Jan 2021 08:26:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609950375; cv=none; d=google.com; s=arc-20160816; b=sxvGlqFV2cYfLD70itQ9Ur0iUqp7O93uKeBVQBchwFgOlmxsfPn7TeTYIPQPAtnjTZ L2CEAVgaSLPCI3jxorcohT6sj+fNaJrzGWRAi8pEx6IKHq84pxXRTwzZ5fcx45TBf8NN zWMk+ooE2nWn/eRo0v9GokT+ATU9kewI93rYAj6dF+LYN7lw3Q66cMwQMmfLnITMIXl/ T9XhTtODDSGABevaeprEAVsXtKbG/G6HRPbY5yYamoST/xhcLru8moEzLgVGvEmC8M7j kQ2rHy1gkQHRX0A29djpoM/57FqohCCP9786gDuxQ3G77NWYmqZXFscayRd0FPYAFfjm wm7g== 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=yxjk3/MkpIVlH9yFpWVIkjkZpSuaGutW5AgnizrNltZJf3U1QoWfY9DzDJlxrL088L X4cM/Yu7EhzZUwlDiIiLL6zQeW5iGeocKS3U4lLyYPdnGMHoFyBPMnQFMZFyqm12HYPv n+FBjmNbjDNh4YGf+RDf2I8Smg9wv8D3eR/SujXuk+CnEhQ5D/MQ78ha+Waq4QvvUEmS bqO+tRJlu0w1mFT8FNwehmaZOcksN/xtZ61bKm/8eD6QM3pSZ6jStXFbvAqIWvcl1Iwv WhyTcNxpcLhT0pxHCPRgYYkf4ZXflBgP4vz9GSctyqNORgjCy7BAkQfw77fisbT9cGtZ ARMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=4BXTUOQt; 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 jg16si1059639ejc.580.2021.01.06.08.25.51; Wed, 06 Jan 2021 08:26:15 -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=4BXTUOQt; 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 S1727720AbhAFQYC (ORCPT + 99 others); Wed, 6 Jan 2021 11:24:02 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:1211 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727701AbhAFQYA (ORCPT ); Wed, 6 Jan 2021 11:24:00 -0500 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 106GHwHk032690; Wed, 6 Jan 2021 17:23:08 +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=4BXTUOQtM9igI91+mk4r5kRFcilGBZ9Z6KrXmSJv3Xje4HDl+uLhm6Rrpf3jFnYzceM+ vNQKesM3W0jg2BedDLH5L6UJtaImfLTRY23ix+TNAJn8wglf8ltuvT6UyX12Os5HTEFl iaaltRMLTdY2n8XEDXFU6i2cd+pIGZYh8JLXoV+ggi6cWPMGKdfTE7VVRy4I6PDjFZAQ 7512gPeqBQUegbEvBX0E1Ng4w12dj1LZACEom7vo6SJqfySYW1ZWt+1Nux3bdfe4lyYQ h4XdCa0O+pfV3HOTWkNhBQnJ+7SWFzvoa6ScHeR2NrNCdBhMlDpIh5oeWDnIcTXpThU8 8Q== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 35teuv8n05-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Jan 2021 17:23:08 +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 DD325100038; Wed, 6 Jan 2021 17:23:07 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id D1DD02AD2C6; Wed, 6 Jan 2021 17:23:07 +0100 (CET) Received: from localhost (10.75.127.50) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 6 Jan 2021 17:23:07 +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 v2 6/8] serial: stm32: update conflicting RTS/CTS config comment Date: Wed, 6 Jan 2021 17:22:01 +0100 Message-ID: <20210106162203.28854-7-erwan.leray@foss.st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210106162203.28854-1-erwan.leray@foss.st.com> References: <20210106162203.28854-1-erwan.leray@foss.st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.75.127.50] X-ClientProxiedBy: SFHDAG2NODE3.st.com (10.75.127.6) 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=2021-01-06_09:2021-01-06,2021-01-06 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