From 88fcded3b0c52cd6eb81900cb535fdacf8ee5c35 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Fri, 10 Jan 2020 09:44:52 -0600
Subject: [PATCH] dts: boards: Define dts aliases at soc level for lpc socs

Defines device tree aliases for on-chip peripherals at the soc level
instead of the board level for all lpc socs. The eliminates some
duplicate code in the board level device trees, and will allow drivers
to use device-tree generated macros directly instead of through dts
fixups.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi | 3 ---
 boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi | 2 --
 dts/arm/nxp/nxp_lpc54xxx.dtsi                   | 8 ++++++++
 dts/arm/nxp/nxp_lpc55S6x.dtsi                   | 9 +++++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi b/boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi
index a592b3b77b2..6c99bfb84c4 100644
--- a/boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi
+++ b/boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi
@@ -6,12 +6,9 @@
 
 / {
 	aliases{
-		usart-0 = &usart0;
-		mailbox-0 = &mailbox0;
 		led0 = &red_led;
 		led1 = &green_led;
 		led2 = &blue_led;
-		spi-5 = &spi5;
 	};
 
 	leds {
diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi b/boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi
index 2aae8ee2e3e..06ca4e3db87 100644
--- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi
+++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi
@@ -6,11 +6,9 @@
 
 / {
 	aliases{
-		usart-0 = &usart0;
 		led0 = &red_led;
 		led1 = &green_led;
 		led2 = &blue_led;
-		spi-8 = &spi8;
 	};
 
 	leds {
diff --git a/dts/arm/nxp/nxp_lpc54xxx.dtsi b/dts/arm/nxp/nxp_lpc54xxx.dtsi
index c01810ca54b..f32330c47cd 100644
--- a/dts/arm/nxp/nxp_lpc54xxx.dtsi
+++ b/dts/arm/nxp/nxp_lpc54xxx.dtsi
@@ -7,6 +7,14 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+	aliases{
+		gpio-0 = &gpio0;
+		gpio-1 = &gpio1;
+		mailbox-0 = &mailbox0;
+		spi-5 = &spi5;
+		usart-0 = &usart0;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nxp/nxp_lpc55S6x.dtsi b/dts/arm/nxp/nxp_lpc55S6x.dtsi
index fc1e04b31a5..31f327d712e 100644
--- a/dts/arm/nxp/nxp_lpc55S6x.dtsi
+++ b/dts/arm/nxp/nxp_lpc55S6x.dtsi
@@ -9,6 +9,15 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+	aliases{
+		gpio-0 = &gpio0;
+		gpio-1 = &gpio1;
+		gpio-2 = &gpio2;
+		gpio-3 = &gpio3;
+		spi-8 = &spi8;
+		usart-0 = &usart0;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;