From 1df7eba02ce9c430daf7a2e4675efecd9e057d0f Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Wed, 12 Apr 2017 17:18:44 -0500
Subject: [PATCH] dts: arm: ti: Use hardcoded addresses in cc32xx_launchxl.dtsi

In general we should be using hardcoded addresses in the dtsi files
rather than getting ifdef from other places.  As the unit address of the
node is typically based on the address in hex w/o the '0x' we can't just
use #defines directly.

Change-Id: I0e17e001151728d16842806d9407e66e6e5129cf
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 dts/arm/ti/cc32xx_launchxl.dtsi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dts/arm/ti/cc32xx_launchxl.dtsi b/dts/arm/ti/cc32xx_launchxl.dtsi
index a97361ccef4..0254f647d8b 100644
--- a/dts/arm/ti/cc32xx_launchxl.dtsi
+++ b/dts/arm/ti/cc32xx_launchxl.dtsi
@@ -1,5 +1,4 @@
 #include <arm/armv7-m.dtsi>
-#include <inc/hw_memmap.h>
 #include <inc/hw_ints.h>
 
 /* Note: Zephyr uses exception numbers, vs the IRQ #s used by the CC3200 SDK */
@@ -25,17 +24,17 @@
 	};
 
 	soc {
-		uart0: uart@UARTA0_BASE {
+		uart0: uart@4000C000 {
 			compatible = "ti,cc32xx-uart";
-			reg = <UARTA0_BASE 0x4c>;
+			reg = <0x4000C000 0x4c>;
 			interrupts = <EXP_UARTA0 3>;
 			baud-rate = <115200>;
 			status = "disabled";
 		};
 
-		uart1: uart@UARTA1_BASE {
+		uart1: uart@4000D000 {
 			compatible = "ti,cc32xx-uart";
-			reg = <UARTA1_BASE 0x4c>;
+			reg = <0x4000D000 0x4c>;
 			interrupts = <EXP_UARTA1 3>;
 			baud-rate = <115200>;
 			status = "disabled";