From: Daniel Mack <daniel@zonque.org>
Date: Fri, 30 Nov 2018 17:55:39 +0000 (+0100)
Subject: ARM: dts: pxa2xx: fix hwuart memory range
X-Git-Tag: v5.0-rc1~77^2~36^2~4
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=513057f110a7c3c53ab08499e29dec29c6852648;p=linux%2F.git

ARM: dts: pxa2xx: fix hwuart memory range

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 <daniel@zonque.org>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---

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 @@ stuart: serial@40700000 {
 			status = "disabled";
 		};
 
-		hwuart: serial@41100000 {
+		hwuart: serial@41600000 {
 			compatible = "mrvl,pxa-uart";
-			reg = <0x41100000 0x30>;
+			reg = <0x41600000 0x30>;
 			interrupts = <7>;
 			status = "disabled";
 		};