boards: dts: Configure lpc flexcomm nodes as usart at the board level

Don't assume in the soc level device trees that flexcomm nodes will
always be configured as usart. Instead, configure flexcomm nodes at the
board level for lpcxpresso55s69 and lpcxpresso54114 boards.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>

boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi

@@ -9,6 +9,7 @@
 		led0 = &red_led;
 		led1 = &green_led;
 		led2 = &blue_led;
+		usart-0 = &flexcomm0;
 	};
 
 	leds {
@@ -31,6 +32,11 @@
 	};
 };
 
+&flexcomm0 {
+	compatible = "nxp,lpc-usart";
+	current-speed = <115200>;
+};
+
 arduino_i2c: &flexcomm4 {
 	compatible = "nxp,lpc-i2c";
 	clock-frequency = <I2C_BITRATE_STANDARD>;

boards/arm/lpcxpresso54114/lpcxpresso54114_m0.dts

@@ -16,8 +16,8 @@
 	chosen {
 		zephyr,sram = &sram2;
 		zephyr,flash = &sram1;
-		/*zephyr,console = &usart0; uncomment to use console on M0  */
+		/*zephyr,console = &flexcomm0; uncomment to use console on M0  */
-		/*zephyr,shell-uart = &usart0; uncomment to use shell on M0 */
+		/*zephyr,shell-uart = &flexcomm0; uncomment to use shell on M0 */
 	};
 };
 

boards/arm/lpcxpresso54114/lpcxpresso54114_m4.dts

@@ -22,8 +22,8 @@
 	chosen {
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
-		zephyr,console = &usart0;
+		zephyr,console = &flexcomm0;
-		zephyr,shell-uart = &usart0;
+		zephyr,shell-uart = &flexcomm0;
 	};
 
 	gpio_keys {
@@ -47,11 +47,6 @@
 	clock-frequency = <48000000>;
 };
 
-&usart0 {
-	status = "okay";
-	current-speed = <115200>;
-};
-
 &mailbox0 {
 	status = "okay";
 };
@@ -68,6 +63,10 @@
 	status = "okay";
 };
 
+&flexcomm0 {
+	status = "okay";
+};
+
 &flexcomm4 {
 	status = "okay";
 };

boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi

@@ -9,6 +9,7 @@
 		led0 = &red_led;
 		led1 = &green_led;
 		led2 = &blue_led;
+		usart-0 = &flexcomm0;
 	};
 
 	leds {
@@ -31,6 +32,11 @@
 	};
 };
 
+&flexcomm0 {
+	compatible = "nxp,lpc-usart";
+	current-speed = <115200>;
+};
+
 arduino_i2c: &flexcomm4 {
 	compatible = "nxp,lpc-i2c";
 	clock-frequency = <I2C_BITRATE_STANDARD>;

boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts

@@ -27,8 +27,8 @@
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &sramx;
-		zephyr,console = &usart0;
+		zephyr,console = &flexcomm0;
-		zephyr,shell-uart = &usart0;
+		zephyr,shell-uart = &flexcomm0;
 	};
 
 	gpio_keys {
@@ -48,11 +48,6 @@
 	};
 };
 
-&usart0 {
-	status = "okay";
-	current-speed = <115200>;
-};
-
 &gpio0 {
 	status = "okay";
 };
@@ -69,6 +64,10 @@
 	status = "okay";
 };
 
+&flexcomm0 {
+	status = "okay";
+};
+
 &flexcomm4 {
 	status = "okay";
 };

boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns.dts

@@ -26,8 +26,8 @@
 	chosen {
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
-		zephyr,console = &usart0;
+		zephyr,console = &flexcomm0;
-		zephyr,shell-uart = &usart0;
+		zephyr,shell-uart = &flexcomm0;
 	};
 
 	gpio_keys {
@@ -47,11 +47,6 @@
 	};
 };
 
-&usart0 {
-	status = "okay";
-	current-speed = <115200>;
-};
-
 &gpio0 {
 	status = "okay";
 };
@@ -72,6 +67,10 @@
 	status = "okay";
 };
 
+&flexcomm0 {
+	status = "okay";
+};
+
 &spi8 {
 	status = "okay";
 };

dts/arm/nxp/nxp_lpc54xxx.dtsi

@@ -13,7 +13,6 @@
 		gpio-1 = &gpio1;
 		mailbox-0 = &mailbox0;
 		spi-5 = &spi5;
-		usart-0 = &usart0;
 	};
 
 	cpus {
@@ -58,14 +57,6 @@
 			reg = <0 0x40000>;
 		};
 
-		usart0:usart@40086000 {
-			compatible = "nxp,lpc-usart";
-			reg = <0x40086000 0xE44>;
-			interrupts = <14 0>;
-			label = "USART_0";
-			status = "disabled";
-		};
-
 		gpio0: gpio@0 {
 			compatible = "nxp,lpc-gpio";
 			reg = <0x4008c000 0x2488>;
@@ -92,6 +83,14 @@
 			status = "disabled";
 		};
 
+		flexcomm0: flexcomm@40086000 {
+			compatible = "nxp,lpc-flexcomm";
+			reg = <0x40086000 0x1000>;
+			interrupts = <14 0>;
+			label = "FLEXCOMM_0";
+			status = "disabled";
+		};
+
 		flexcomm4: flexcomm@4008a000 {
 			compatible = "nxp,lpc-flexcomm";
 			reg = <0x4008a000 0x1000>;

dts/arm/nxp/nxp_lpc55S6x.dtsi

@@ -16,7 +16,6 @@
 		gpio-2 = &gpio2;
 		gpio-3 = &gpio3;
 		spi-8 = &spi8;
-		usart-0 = &usart0;
 	};
 
 	cpus {
@@ -102,14 +101,6 @@
 			};
 		};
 
-		usart0: usart@50086000 {
-			compatible = "nxp,lpc-usart";
-			reg = <0x50086000 0xE44>;
-			interrupts = <14 0>;
-			label = "USART_0";
-			status = "disabled";
-		};
-
 		gpio0: gpio@0 {
 			compatible = "nxp,lpc-gpio";
 			reg = <0x5008c000 0x2488>;
@@ -144,6 +135,14 @@
 			#gpio-cells = <2>;
 		};
 
+		flexcomm0: flexcomm@50086000 {
+			compatible = "nxp,lpc-flexcomm";
+			reg = <0x50086000 0x1000>;
+			interrupts = <14 0>;
+			label = "FLEXCOMM_0";
+			status = "disabled";
+		};
+
 		flexcomm4: flexcomm@5008a000 {
 			compatible = "nxp,lpc-flexcomm";
 			reg = <0x5008a000 0x1000>;

dts/arm/nxp/nxp_lpc55S6x_ns.dtsi

@@ -15,7 +15,6 @@
 		gpio-2 = &gpio2;
 		gpio-3 = &gpio3;
 		spi-8 = &spi8;
-		usart-0 = &usart0;
 	};
 
 	cpus {
@@ -99,14 +98,6 @@
 			};
 		};
 
-		usart0: usart@40086000 {
-			compatible = "nxp,lpc-usart";
-			reg = <0x40086000 0xe44>;
-			interrupts = <14 0>;
-			label = "USART_0";
-			status = "disabled";
-		};
-
 		gpio0: gpio@0 {
 			compatible = "nxp,kinetis-gpio";
 			reg = <0x4008c000 0x2488>;
@@ -141,6 +132,14 @@
 			#gpio-cells = <2>;
 		};
 
+		flexcomm0: flexcomm@40086000 {
+			compatible = "nxp,lpc-flexcomm";
+			reg = <0x40086000 0x1000>;
+			interrupts = <14 0>;
+			label = "FLEXCOMM_0";
+			status = "disabled";
+		};
+
 		spi8: spi@4009f000 {
 			compatible = "nxp,lpc-spi";
 			reg = <0x4009f000 0x1000>;