From a500905b4b962c3714380d8a4e5d493755abb95d Mon Sep 17 00:00:00 2001
From: Erwan Gouriou <erwan.gouriou@linaro.org>
Date: Wed, 12 Jan 2022 16:25:37 +0100
Subject: [PATCH] boards: b_u585i_iot02a: Move peripherals to -common.dtsi

Move available, enabled, peripherals to -common.dtsi file
as a preliminary step to TFM _ns target for this board.
All these peripheral should be similarly accessible on both targets.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
---
 .../b_u585i_iot02a/b_u585i_iot02a-common.dtsi | 68 +++++++++++++++++++
 boards/arm/b_u585i_iot02a/b_u585i_iot02a.dts  | 68 -------------------
 2 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/boards/arm/b_u585i_iot02a/b_u585i_iot02a-common.dtsi b/boards/arm/b_u585i_iot02a/b_u585i_iot02a-common.dtsi
index 1a801d9faef..8f0569e48a2 100644
--- a/boards/arm/b_u585i_iot02a/b_u585i_iot02a-common.dtsi
+++ b/boards/arm/b_u585i_iot02a/b_u585i_iot02a-common.dtsi
@@ -78,3 +78,71 @@
 	apb2-prescaler = <1>;
 	apb3-prescaler = <1>;
 };
+
+&cpu0 {
+	cpu-power-states = <&stop0 &stop1 &stop2>;
+};
+
+&lptim1 {
+	status = "okay";
+};
+
+&usart1 {
+	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+&spi1 {
+	pinctrl-0 = <&spi1_nss_pe12 &spi1_sck_pe13
+		     &spi1_miso_pe14 &spi1_mosi_pe15>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&i2c1 {
+	pinctrl-0 = <&i2c1_scl_pb8 &i2c1_sda_pb9>;
+	pinctrl-names = "default";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+};
+
+&i2c2 {
+	pinctrl-0 = <&i2c2_scl_ph4 &i2c2_sda_ph5>;
+	pinctrl-names = "default";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+
+	hts221@5f {
+		compatible = "st,hts221";
+		reg = <0x5f>;
+		label = "HTS221";
+	};
+};
+
+&rng {
+	status = "okay";
+};
+
+zephyr_udc0: &usbotg_fs {
+	pinctrl-0 = <&usb_otg_fs_dm_pa11 &usb_otg_fs_dp_pa12>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&adc1 {
+	pinctrl-0 = <&adc1_in15_pb0>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&dac1 {
+	pinctrl-0 = <&dac1_out1_pa4>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&iwdg {
+	status = "okay";
+};
diff --git a/boards/arm/b_u585i_iot02a/b_u585i_iot02a.dts b/boards/arm/b_u585i_iot02a/b_u585i_iot02a.dts
index 82a53cfa68f..0dd81ded4f3 100644
--- a/boards/arm/b_u585i_iot02a/b_u585i_iot02a.dts
+++ b/boards/arm/b_u585i_iot02a/b_u585i_iot02a.dts
@@ -24,71 +24,3 @@
 		sw0 = &user_button;
 	};
 };
-
-&cpu0 {
-	cpu-power-states = <&stop0 &stop1 &stop2>;
-};
-
-&lptim1 {
-	status = "okay";
-};
-
-&usart1 {
-	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
-	pinctrl-names = "default";
-	current-speed = <115200>;
-	status = "okay";
-};
-
-&spi1 {
-	pinctrl-0 = <&spi1_nss_pe12 &spi1_sck_pe13
-		     &spi1_miso_pe14 &spi1_mosi_pe15>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&i2c1 {
-	pinctrl-0 = <&i2c1_scl_pb8 &i2c1_sda_pb9>;
-	pinctrl-names = "default";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c2 {
-	pinctrl-0 = <&i2c2_scl_ph4 &i2c2_sda_ph5>;
-	pinctrl-names = "default";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-
-	hts221@5f {
-		compatible = "st,hts221";
-		reg = <0x5f>;
-		label = "HTS221";
-	};
-};
-
-&rng {
-	status = "okay";
-};
-
-zephyr_udc0: &usbotg_fs {
-	pinctrl-0 = <&usb_otg_fs_dm_pa11 &usb_otg_fs_dp_pa12>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&adc1 {
-	pinctrl-0 = <&adc1_in15_pb0>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&dac1 {
-	pinctrl-0 = <&dac1_out1_pa4>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&iwdg {
-	status = "okay";
-};