From patchwork Fri Nov 30 17:55:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 10706979 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0DC574B7E for ; Fri, 30 Nov 2018 18:10:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F08313023C for ; Fri, 30 Nov 2018 18:10:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4CF930242; Fri, 30 Nov 2018 18:10:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8E1193023C for ; Fri, 30 Nov 2018 18:10:14 +0000 (UTC) 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=nbhH3kTnEp92YPocdsYOaLy+Ul8Avtm1LAMNZfvKlJw=; b=RDlUvSdiUDesdt aTcEkGKONnPkIouzzndXnr56FViT1qNs1XTj2LcvXF71nmCwruNIsjCLATdatlnuATyZZMy+8y+Yw c1FoPfRd0EMB2YHmCyupwCpaK7Z87Y5kWnNtFaxj8xocVf+WhwGlGassr9y/FIQ24/qGf7lvE/Bkq Ym+8s/Q78ZUD/92Gr6PZetrjzy4OB5KcoCgjVtAb8OJLj14TvA7mWJQ8oxgxDWQ67h1MwXuZuGI73 6YVZZICgobYEQP3ZOP/n/wOTZHoBTFm53+5oJwOwvh/oHpNDbX+gY52V8TjzHA49N4tR/kgwrnOlg 7lzczt0rQLIXxd+ghxNw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSnEz-0003vN-Iq; Fri, 30 Nov 2018 18:10:13 +0000 Received: from mail.bugwerft.de ([2a03:6000:1011::59]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSn1M-0003E8-Si for linux-arm-kernel@lists.infradead.org; Fri, 30 Nov 2018 17:56:10 +0000 Received: from localhost.localdomain (pD95EF9A6.dip0.t-ipconnect.de [217.94.249.166]) by mail.bugwerft.de (Postfix) with ESMTPSA id C275C2C459A; Fri, 30 Nov 2018 17:55:39 +0000 (UTC) From: Daniel Mack To: robert.jarzmik@free.fr, haojian.zhuang@gmail.com Subject: [PATCH 3/7] ARM: dts: pxa2xx: fix hwuart memory range Date: Fri, 30 Nov 2018 18:55:39 +0100 Message-Id: <20181130175543.32628-4-daniel@zonque.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181130175543.32628-1-daniel@zonque.org> References: <20181130175543.32628-1-daniel@zonque.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181130_095609_057437_4EC64F71 X-CRM114-Status: UNSURE ( 9.51 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, robh+dt@kernel.org, Daniel Mack , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The memory range for the hwuart is at 0x41600000, not 0x41100000. This also solves a conflict with the MMC controller node. Signed-off-by: Daniel Mack --- arch/arm/boot/dts/pxa2xx.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index 7d3dfa8259f8..30e77ebbcc4d 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -117,9 +117,9 @@ status = "disabled"; }; - hwuart: serial@41100000 { + hwuart: serial@41600000 { compatible = "mrvl,pxa-uart"; - reg = <0x41100000 0x30>; + reg = <0x41600000 0x30>; interrupts = <7>; status = "disabled"; };