From d257460e9db47f043d7cc8f88f0b64c1f19c0b1e Mon Sep 17 00:00:00 2001
From: Andrew Featherstone <andrew.featherstone@gmail.com>
Date: Tue, 27 Aug 2024 17:55:49 +0100
Subject: [PATCH] dts: arm: Move rpi_pico under raspberrypi

Follow the wider directory convention of dts/<arch>/<vendor>/<family>.

This is foundation work ahead of introducing support for the RP2350.

Signed-off-by: Andrew Featherstone <andrew.featherstone@gmail.com>
---
 MAINTAINERS.yml                                                | 2 +-
 boards/adafruit/kb2040/adafruit_kb2040.dts                     | 2 +-
 boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts         | 2 +-
 boards/raspberrypi/rpi_pico/rpi_pico-common.dtsi               | 2 +-
 boards/seeed/xiao_rp2040/xiao_rp2040.dts                       | 2 +-
 boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts | 2 +-
 boards/wiznet/w5500_evb_pico/w5500_evb_pico.dts                | 2 +-
 dts/arm/{ => raspberrypi}/rpi_pico/override.dtsi               | 0
 dts/arm/{ => raspberrypi}/rpi_pico/rp2040.dtsi                 | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename dts/arm/{ => raspberrypi}/rpi_pico/override.dtsi (100%)
 rename dts/arm/{ => raspberrypi}/rpi_pico/rp2040.dtsi (99%)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index e12dc9c413c..5badb24d1ee 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -3517,7 +3517,7 @@ Raspberry Pi Pico Platforms:
     - boards/raspberrypi/
     - boards/adafruit/kb2040/
     - boards/sparkfun/pro_micro_rp2040/
-    - dts/arm/rpi_pico/
+    - dts/arm/raspberrypi/rpi_pico/
     - dts/bindings/*/raspberrypi,pico*
     - drivers/*/*rpi_pico
     - drivers/*/*rpi_pico*/
diff --git a/boards/adafruit/kb2040/adafruit_kb2040.dts b/boards/adafruit/kb2040/adafruit_kb2040.dts
index 45ff45595d2..b42b196b173 100644
--- a/boards/adafruit/kb2040/adafruit_kb2040.dts
+++ b/boards/adafruit/kb2040/adafruit_kb2040.dts
@@ -7,7 +7,7 @@
 
 /dts-v1/;
 
-#include <rpi_pico/rp2040.dtsi>
+#include <raspberrypi/rpi_pico/rp2040.dtsi>
 #include "adafruit_kb2040-pinctrl.dtsi"
 #include "sparkfun_pro_micro_connector.dtsi"
 #include <freq.h>
diff --git a/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts b/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts
index 0209c1b86cd..088325845c4 100644
--- a/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts
+++ b/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts
@@ -7,7 +7,7 @@
 
 /dts-v1/;
 
-#include <rpi_pico/rp2040.dtsi>
+#include <raspberrypi/rpi_pico/rp2040.dtsi>
 #include "adafruit_qt_py_rp2040-pinctrl.dtsi"
 #include "seeed_xiao_connector.dtsi"
 #include <freq.h>
diff --git a/boards/raspberrypi/rpi_pico/rpi_pico-common.dtsi b/boards/raspberrypi/rpi_pico/rpi_pico-common.dtsi
index 2b40cf3540b..8a39871e192 100644
--- a/boards/raspberrypi/rpi_pico/rpi_pico-common.dtsi
+++ b/boards/raspberrypi/rpi_pico/rpi_pico-common.dtsi
@@ -6,7 +6,7 @@
 
 #include <freq.h>
 
-#include <rpi_pico/rp2040.dtsi>
+#include <raspberrypi/rpi_pico/rp2040.dtsi>
 #include "rpi_pico-pinctrl.dtsi"
 #include <zephyr/dt-bindings/pwm/pwm.h>
 
diff --git a/boards/seeed/xiao_rp2040/xiao_rp2040.dts b/boards/seeed/xiao_rp2040/xiao_rp2040.dts
index 0a52f47d672..61c917be38a 100644
--- a/boards/seeed/xiao_rp2040/xiao_rp2040.dts
+++ b/boards/seeed/xiao_rp2040/xiao_rp2040.dts
@@ -7,7 +7,7 @@
 
 /dts-v1/;
 
-#include <rpi_pico/rp2040.dtsi>
+#include <raspberrypi/rpi_pico/rp2040.dtsi>
 #include "xiao_rp2040-pinctrl.dtsi"
 #include "seeed_xiao_connector.dtsi"
 #include <freq.h>
diff --git a/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts b/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts
index 43761b85a14..8c4e5acaf2c 100644
--- a/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts
+++ b/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts
@@ -6,7 +6,7 @@
 
 /dts-v1/;
 
-#include <rpi_pico/rp2040.dtsi>
+#include <raspberrypi/rpi_pico/rp2040.dtsi>
 #include "sparkfun_pro_micro_rp2040-pinctrl.dtsi"
 #include "sparkfun_pro_micro_connector.dtsi"
 #include <freq.h>
diff --git a/boards/wiznet/w5500_evb_pico/w5500_evb_pico.dts b/boards/wiznet/w5500_evb_pico/w5500_evb_pico.dts
index c14cb0b7d64..5f5cf14cced 100644
--- a/boards/wiznet/w5500_evb_pico/w5500_evb_pico.dts
+++ b/boards/wiznet/w5500_evb_pico/w5500_evb_pico.dts
@@ -9,7 +9,7 @@
 
 #include <freq.h>
 
-#include <rpi_pico/rp2040.dtsi>
+#include <raspberrypi/rpi_pico/rp2040.dtsi>
 #include "w5500_evb_pico-pinctrl.dtsi"
 #include <zephyr/dt-bindings/pwm/pwm.h>
 
diff --git a/dts/arm/rpi_pico/override.dtsi b/dts/arm/raspberrypi/rpi_pico/override.dtsi
similarity index 100%
rename from dts/arm/rpi_pico/override.dtsi
rename to dts/arm/raspberrypi/rpi_pico/override.dtsi
diff --git a/dts/arm/rpi_pico/rp2040.dtsi b/dts/arm/raspberrypi/rpi_pico/rp2040.dtsi
similarity index 99%
rename from dts/arm/rpi_pico/rp2040.dtsi
rename to dts/arm/raspberrypi/rpi_pico/rp2040.dtsi
index 00d53f8b3d2..f192e596d03 100644
--- a/dts/arm/rpi_pico/rp2040.dtsi
+++ b/dts/arm/raspberrypi/rpi_pico/rp2040.dtsi
@@ -13,7 +13,7 @@
 #include <zephyr/dt-bindings/reset/rpi_pico_reset.h>
 #include <mem.h>
 
-#include <arm/rpi_pico/override.dtsi>
+#include <arm/raspberrypi/rpi_pico/override.dtsi>
 /*
  * This value can be overridden at the board level or in an application specific
  * override.dtsi file.