From 44aa6f11a675e360b5ffe202a5fc8cca293600e9 Mon Sep 17 00:00:00 2001
From: Nazar Palamar <nazar.palamar@infineon.com>
Date: Thu, 14 Nov 2024 09:35:09 +0200
Subject: [PATCH] cy8ckit_062_ble: board: moved uart-6 to common dts for m4

Moved uatr6 to common dts for m4

- cm0 uses uart-5 in ver 0.0.0 and uart-5 in ver 1.0.0 (for
using of Arduino headers).

- cm4 by default uses uart-2 (for ver 0.0.0 and ver 1.0.0)

Signed-off-by: Nazar Palamar <nazar.palamar@infineon.com>
---
 .../cy8ckit_062_ble_cy8c6347_m4.dts           | 15 +++++++++++
 .../cy8ckit_062_ble_cy8c6347_m4_0_0_0.overlay | 26 -------------------
 2 files changed, 15 insertions(+), 26 deletions(-)
 delete mode 100644 boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4_0_0_0.overlay

diff --git a/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4.dts b/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4.dts
index e232445e811..dc702bf2a76 100644
--- a/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4.dts
+++ b/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4.dts
@@ -9,13 +9,28 @@
 
 #include <infineon/cat1a/legacy/psoc6_cm4.dtsi>
 #include "cy8ckit_062_ble_common.dtsi"
+#include "cy8ckit_062_ble_cy8c6347-pinctrl.dtsi"
 
 / {
 	model = "Cypress PSoC6 BLE Pioneer Kit";
 	compatible = "cypress,cy8c6xx7_cm4", "cypress,psoc6";
 
+	aliases {
+		uart-6 = &uart6;
+	};
+
 	chosen {
 		zephyr,sram = &sram2;
 		zephyr,flash = &flash1;
+		zephyr,console = &uart6;
+		zephyr,shell-uart = &uart6;
 	};
 };
+
+&uart6 {
+	status = "okay";
+	current-speed = <115200>;
+
+	pinctrl-0 = <&p13_0_scb6_uart_rx &p13_1_scb6_uart_tx>;
+	pinctrl-names = "default";
+};
diff --git a/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4_0_0_0.overlay b/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4_0_0_0.overlay
deleted file mode 100644
index 26f422a9b4d..00000000000
--- a/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4_0_0_0.overlay
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2021, ATL Electronics
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "cy8ckit_062_ble_cy8c6347-pinctrl.dtsi"
-
-/ {
-	aliases {
-		uart-6 = &uart6;
-	};
-
-	chosen {
-		zephyr,console = &uart6;
-		zephyr,shell-uart = &uart6;
-	};
-};
-
-&uart6 {
-	status = "okay";
-	current-speed = <115200>;
-
-	pinctrl-0 = <&p13_0_scb6_uart_rx &p13_1_scb6_uart_tx>;
-	pinctrl-names = "default";
-};