From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E652C3B1A1 for ; Fri, 14 Feb 2020 16:41:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8D2824680 for ; Fri, 14 Feb 2020 16:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581698482; bh=nBg3B4SGh9ImBA80puCaQjptdsSOnQ4qH+lPv9TJtHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wWmBjAGMtz3Gf6xNFJ0FtghSYk3hkEBZmFI4PepbaMXWsEbrQYih+o3UpcbC8Bhj2 LQBuI/QTMl3xswxvGv9qcIRPVsiHRPFvAT36MRRKVrF5Sw0QWgvr0H2GVITPtKsCZT Qzl+hWHZfvRwnE+YkmlyDLP46DQvBMQ81qEa2FhM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390724AbgBNQlT (ORCPT ); Fri, 14 Feb 2020 11:41:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:58406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405101AbgBNQWj (ORCPT ); Fri, 14 Feb 2020 11:22:39 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 07BA3246B0; Fri, 14 Feb 2020 16:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581697358; bh=nBg3B4SGh9ImBA80puCaQjptdsSOnQ4qH+lPv9TJtHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LYQq+k9xUifjacSiM+WgG+99MoW7jhPeHwot5cGoNXawGyCXQwaUWeM3T2AHtu8Qg RE5BjTHVwPGWVWR/cxV5ZI1gKdh6pS1XPRNvSq9R9ixz2R15ghbJThVzlAMkWypZO3 snyvI58iQxgVeNX1JqJmqtjM8EP1AQtsztKcINWc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Stephen Rothwell , David Engraf , Sasha Levin , linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.9 060/141] Revert "tty/serial: atmel: fix out of range clock divider handling" Date: Fri, 14 Feb 2020 11:20:00 -0500 Message-Id: <20200214162122.19794-60-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214162122.19794-1-sashal@kernel.org> References: <20200214162122.19794-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org From: Greg Kroah-Hartman [ Upstream commit 6dbd54e4154dfe386b3333687de15be239576617 ] This reverts commit 751d0017334db9c4d68a8909c59f662a6ecbcec6. The wrong commit got added to the tty-next tree, the correct one is in the tty-linus branch. Reported-by: Stephen Rothwell Cc: David Engraf Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/atmel_serial.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 325f9db2da86c..255be61b4073a 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -2200,6 +2200,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, mode |= ATMEL_US_USMODE_NORMAL; } + /* set the mode, clock divisor, parity, stop bits and data size */ + atmel_uart_writel(port, ATMEL_US_MR, mode); + /* * Set the baud rate: * Fractional baudrate allows to setup output frequency more -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6822C2BA83 for ; Fri, 14 Feb 2020 16:54:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97FEE20656 for ; Fri, 14 Feb 2020 16:54:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JY/5HPNl"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="LYQq+k9x" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97FEE20656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4rmEaOm3W18fdyvFOKDBa6clchB7FgYZ/M4d9GGmpEo=; b=JY/5HPNlEt4mHj f/M8B5KgWhiohnJr3qeUhFx3CmBnVqRkbV76xtkzndyLinJNaH5HgqR0yREX6j2n6owMJQathcw0E LxhtozQmS83rbqfMGp2x6WrsSbl1WLkf9tmstS9rgUzYwXbMFLMUyWXpqsVysPScYpj2I1QV49c4G Ft1XJYYnLpeZZcd29eDlfwCDzPY+QKluQcSIkzWEcxccdwb2SgPE1jIclNGM5BrQgKOaX0IanBlnF MkbOZ98OjWn/fhlo6Fyc3dIo4Vx3WJAQnJGj9a9wE3qvN+vTMMewcx/AS2hO0PYHzSyRcCDvoiR9E UvkLrruN6mN44rOwTkOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j2eEK-00027G-75; Fri, 14 Feb 2020 16:54:16 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j2djj-0006PY-Mb for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2020 16:22:49 +0000 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 07BA3246B0; Fri, 14 Feb 2020 16:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581697358; bh=nBg3B4SGh9ImBA80puCaQjptdsSOnQ4qH+lPv9TJtHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LYQq+k9xUifjacSiM+WgG+99MoW7jhPeHwot5cGoNXawGyCXQwaUWeM3T2AHtu8Qg RE5BjTHVwPGWVWR/cxV5ZI1gKdh6pS1XPRNvSq9R9ixz2R15ghbJThVzlAMkWypZO3 snyvI58iQxgVeNX1JqJmqtjM8EP1AQtsztKcINWc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 060/141] Revert "tty/serial: atmel: fix out of range clock divider handling" Date: Fri, 14 Feb 2020 11:20:00 -0500 Message-Id: <20200214162122.19794-60-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214162122.19794-1-sashal@kernel.org> References: <20200214162122.19794-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200214_082239_782441_EF3A9149 X-CRM114-Status: UNSURE ( 9.99 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Stephen Rothwell , Greg Kroah-Hartman , linux-serial@vger.kernel.org, David Engraf , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Greg Kroah-Hartman [ Upstream commit 6dbd54e4154dfe386b3333687de15be239576617 ] This reverts commit 751d0017334db9c4d68a8909c59f662a6ecbcec6. The wrong commit got added to the tty-next tree, the correct one is in the tty-linus branch. Reported-by: Stephen Rothwell Cc: David Engraf Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/atmel_serial.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 325f9db2da86c..255be61b4073a 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -2200,6 +2200,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, mode |= ATMEL_US_USMODE_NORMAL; } + /* set the mode, clock divisor, parity, stop bits and data size */ + atmel_uart_writel(port, ATMEL_US_MR, mode); + /* * Set the baud rate: * Fractional baudrate allows to setup output frequency more -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel