boards: replace am64x_m4.dtsi

This patch replaces the included am64x_m4.dtsi file with the new
am64x_am243x_m4.dtsi file to maintain uniformity. Additionally, delete the
am64x_m4.dtsi file since it is no longer in use anywhere.

Affected boards:
- phyboard_electra
- sk_am64

Signed-off-by: Amneesh Singh <[email protected]>

Author: natto1784

boards/phytec/phyboard_electra/phyboard_electra_am6442_m4.dts

@@ -7,16 +7,18 @@
 
 /dts-v1/;
 
-#include <ti/am64x_m4.dtsi>
+#include <zephyr/dt-bindings/pinctrl/ti-k3-pinctrl.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <ti/am64x_am243x_m4.dtsi>
 
 / {
 	model = "PHYTEC phyBOARD-Electra AM64x M4";
 	compatible = "phytec,phyboard-electra-am64xx-m4", "ti,am6442";
 
 	chosen {
 		zephyr,sram = &sram0;
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
+		zephyr,console = &mcu_uart0;
+		zephyr,shell-uart = &mcu_uart0;
 		zephyr,ipc_shm = &ddr0;
 		zephyr,sram1 = &ddr1;
 	};
@@ -52,13 +54,13 @@
 	leds: leds {
 		compatible = "gpio-leds";
 		heartbeat_led: led_0 {
-			gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+			gpios = <&mcu_gpio0 6 GPIO_ACTIVE_HIGH>;
 			label = "Heartbeat LED";
 		};
 	};
 };
 
-&pinctrl {
+&mcu_pinctrl {
 	mcu_uart0_rx_default: mcu_uart0_rx_default {
 		pinmux = <K3_PINMUX(0x028, PIN_INPUT, MUX_MODE_0)>;
 	};
@@ -70,14 +72,14 @@
 	};
 };
 
-&uart0 {
+&mcu_uart0 {
 	current-speed = <115200>;
 	pinctrl-0 = <&mcu_uart0_rx_default &mcu_uart0_tx_default>;
 	pinctrl-names = "default";
 	status = "okay";
 };
 
-&gpio0 {
+&mcu_gpio0 {
 	pinctrl-0 = <&mcu_gpio0_led_default>;
 	pinctrl-names = "default";
 	status = "okay";

boards/ti/sk_am64/sk_am64_am6442_m4-pinctrl.dtsi

@@ -7,7 +7,7 @@
 
 #include <zephyr/dt-bindings/pinctrl/ti-k3-pinctrl.h>
 
-&pinctrl {
+&mcu_pinctrl {
 	mcu_uart0_rx_default: mcu_uart0_rx_default {
 		pinmux = <K3_PINMUX(0x028, PIN_INPUT, MUX_MODE_0)>; /* (A9) MCU_UART0_RXD */
 	};

boards/ti/sk_am64/sk_am64_am6442_m4.dts

@@ -7,7 +7,8 @@
 
 /dts-v1/;
 
-#include <ti/am64x_m4.dtsi>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <ti/am64x_am243x_m4.dtsi>
 #include "sk_am64_am6442_m4-pinctrl.dtsi"
 
 / {
@@ -16,8 +17,8 @@
 
 	chosen {
 		zephyr,sram = &sram0;
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
+		zephyr,console = &mcu_uart0;
+		zephyr,shell-uart = &mcu_uart0;
 		zephyr,ipc = &ipc0;
 		zephyr,ipc_shm = &ddr0;
 	};
@@ -54,7 +55,7 @@
 		compatible = "gpio-leds";
 
 		heartbeat_led: led_0 {
-			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+			gpios = <&mcu_gpio0 5 GPIO_ACTIVE_HIGH>;
 			label = "Heartbeat LED";
 		};
 	};
@@ -66,14 +67,14 @@
 	};
 };
 
-&uart0 {
+&mcu_uart0 {
 	current-speed = <115200>;
 	pinctrl-0 = <&mcu_uart0_rx_default &mcu_uart0_tx_default>;
 	pinctrl-names = "default";
 	status = "okay";
 };
 
-&gpio0 {
+&mcu_gpio0 {
 	pinctrl-0 = <&mcu_gpio0_led_default>;
 	pinctrl-names = "default";
 	status = "okay";