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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,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 AEC86C43381 for ; Wed, 27 Mar 2019 18:04:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 781CD2075C for ; Wed, 27 Mar 2019 18:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709877; bh=iMmcy8l6fQyXQugGMiuXU/pVATVpFRkESNIuDS8i0og=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XeJibKl3seW279+rCs+JpF6eAj+522XZmNQNZHhVPPNFaSJqrxAVQMNnX5eFZTGQb TAEnCJoAeHwhfoqMq6TbXmft9rZthO25dtwJ0cIGpe/fXL2Shgp4jg5NSpqmu57zKr XK7J0mLbPVc5BCjE/4dOKly4PsuoAaNQ/HccsrzA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733305AbfC0SEf (ORCPT ); Wed, 27 Mar 2019 14:04:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:45254 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733281AbfC0SEc (ORCPT ); Wed, 27 Mar 2019 14:04:32 -0400 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 6D5F5217F5; Wed, 27 Mar 2019 18:04:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709872; bh=iMmcy8l6fQyXQugGMiuXU/pVATVpFRkESNIuDS8i0og=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GPAPntfikYuETmOemYhZp2NvkrF6hQFlGEGcHfgvCkZ3nTfvcs4rjIcBaIc/uHD1c OFyI+WPVA4OBDzlOt+ker3B7g4z2DkLg+tQQWGrj38oGRnjHAwFl74xc2ZiJPl8/ux TePhnPt3EQKqdFYTuNNDAldZDTRwedQEe7egy27w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lubomir Rintel , Greg Kroah-Hartman , Sasha Levin , linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 082/262] serial: 8250_pxa: honor the port number from devicetree Date: Wed, 27 Mar 2019 13:58:57 -0400 Message-Id: <20190327180158.10245-82-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lubomir Rintel [ Upstream commit fe9ed6d2483fda55465f32924fb15bce0fac3fac ] Like the other OF-enabled drivers, use the port number from the firmware if the devicetree specifies an alias: aliases { ... serial2 = &uart2; /* Should be ttyS2 */ } This is how the deprecated pxa.c driver behaved, switching to 8250_pxa messes up the numbering. Signed-off-by: Lubomir Rintel Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/8250/8250_pxa.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c index b9bcbe20a2be..c47188860e32 100644 --- a/drivers/tty/serial/8250/8250_pxa.c +++ b/drivers/tty/serial/8250/8250_pxa.c @@ -113,6 +113,10 @@ static int serial_pxa_probe(struct platform_device *pdev) if (ret) return ret; + ret = of_alias_get_id(pdev->dev.of_node, "serial"); + if (ret >= 0) + uart.port.line = ret; + uart.port.type = PORT_XSCALE; uart.port.iotype = UPIO_MEM32; uart.port.mapbase = mmres->start; -- 2.19.1