From 20e5c95fc455e158ac95176141871f0cec0b2a7e Mon Sep 17 00:00:00 2001
From: Tarang Raval <tarang.raval@siliconsignals.io>
Date: Sun, 10 Nov 2024 20:09:38 +0530
Subject: [PATCH] dts: arm: rpi_pico: remove #define from dts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removing direct #define usage in the DTSI file and converting these
definitions to use a dt-bindings header instead.

Relocates the RPI_PICO_DEFAULT_IRQ_PRIORITY definition to a DTSI file and
introduces an override.dtsi file. The override file is used when no other
override file is present, allowing for better flexibility and compliance
with Zephyr’s DTS structure.

Fixes: #79719

Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>
---
 dts/arm/rpi_pico/override.dtsi                         |  7 +++++++
 dts/arm/rpi_pico/rp2040.dtsi                           | 10 +++++++++-
 .../zephyr/dt-bindings/reset/rpi_pico_reset.h          |  4 ----
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 dts/arm/rpi_pico/override.dtsi
 rename dts/arm/rpi_pico/rpi_pico_common.dtsi => include/zephyr/dt-bindings/reset/rpi_pico_reset.h (92%)

diff --git a/dts/arm/rpi_pico/override.dtsi b/dts/arm/rpi_pico/override.dtsi
new file mode 100644
index 0000000000000..e252c6acd4e53
--- /dev/null
+++ b/dts/arm/rpi_pico/override.dtsi
@@ -0,0 +1,7 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/*
+ * File intentionally left blank. Will be used when there is no other
+ * higher-priority override.dtsi file in use.
+ */
diff --git a/dts/arm/rpi_pico/rp2040.dtsi b/dts/arm/rpi_pico/rp2040.dtsi
index 1709d01c970d4..00d53f8b3d205 100644
--- a/dts/arm/rpi_pico/rp2040.dtsi
+++ b/dts/arm/rpi_pico/rp2040.dtsi
@@ -10,9 +10,17 @@
 #include <zephyr/dt-bindings/clock/rpi_pico_clock.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/regulator/rpi_pico.h>
+#include <zephyr/dt-bindings/reset/rpi_pico_reset.h>
 #include <mem.h>
 
-#include "rpi_pico_common.dtsi"
+#include <arm/rpi_pico/override.dtsi>
+/*
+ * This value can be overridden at the board level or in an application specific
+ * override.dtsi file.
+ */
+#ifndef RPI_PICO_DEFAULT_IRQ_PRIORITY
+#define RPI_PICO_DEFAULT_IRQ_PRIORITY 3
+#endif
 
 / {
 	aliases {
diff --git a/dts/arm/rpi_pico/rpi_pico_common.dtsi b/include/zephyr/dt-bindings/reset/rpi_pico_reset.h
similarity index 92%
rename from dts/arm/rpi_pico/rpi_pico_common.dtsi
rename to include/zephyr/dt-bindings/reset/rpi_pico_reset.h
index 58e7fff37201e..6f8c537ba4c66 100644
--- a/dts/arm/rpi_pico/rpi_pico_common.dtsi
+++ b/include/zephyr/dt-bindings/reset/rpi_pico_reset.h
@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef RPI_PICO_DEFAULT_IRQ_PRIORITY
-#define RPI_PICO_DEFAULT_IRQ_PRIORITY 3
-#endif
-
 #define RPI_PICO_RESETS_RESET_ADC		0
 #define RPI_PICO_RESETS_RESET_BUSCTRL		1
 #define RPI_PICO_RESETS_RESET_DMA		2