zephyrproject-rtos · carlescufi · Sep 13, 2024 · Sep 6, 2024 · Sep 6, 2024 · Sep 6, 2024
diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
@@ -2317,7 +2317,7 @@ Google Platforms:
     - duda-patryk
   files:
     - boards/google/
-    - samples/boards/google_*/
+    - samples/boards/google/
 
 Hash Utilities:
   status: maintained
@@ -3567,7 +3567,7 @@ Intel Platforms (Xtensa):
     - soc/intel/intel_adsp/
     - dts/xtensa/intel/
     - tests/boards/intel_adsp/
-    - samples/boards/intel_adsp/
+    - samples/boards/intel/adsp/
     - dts/bindings/*/intel,adsp*
     - scripts/west_commands/runners/intel_adsp.py
   labels:
@@ -3693,7 +3693,7 @@ NXP Platforms (S32):
     - drivers/misc/*nxp_s32*/
     - dts/bindings/*/nxp,s32*
     - dts/arm/nxp/*s32*
-    - samples/boards/nxp_s32/
+    - samples/boards/nxp/s32/
     - include/zephyr/dt-bindings/*/nxp-s32*
     - include/zephyr/dt-bindings/*/nxp_s32*
     - include/zephyr/drivers/*/*nxp_s32*
@@ -3800,7 +3800,7 @@ nRF Platforms:
     - drivers/*/*nrf*.c
     - drivers/*/*nordic*/
     - soc/nordic/
-    - samples/boards/nrf/
+    - samples/boards/nordic/
     - dts/*/nordic/
     - dts/bindings/*/nordic,*
     - tests/drivers/*/*nrf*/
@@ -3925,7 +3925,7 @@ STM32 Platforms:
     - dts/arm/st/
     - dts/bindings/*/*stm32*
     - soc/st/stm32/
-    - samples/boards/stm32/
+    - samples/boards/st/
   labels:
     - "platform: STM32"
   description: >-
@@ -3949,7 +3949,7 @@ Espressif Platforms:
     - dts/xtensa/espressif/
     - dts/riscv/espressif/
     - dts/bindings/*/*esp32*
-    - samples/boards/esp32*/
+    - samples/boards/espressif/
     - tests/boards/espressif_esp32/
     - drivers/*/*esp32*/
   labels:
@@ -4075,7 +4075,7 @@ LiteX Platforms:
     - dts/bindings/*/litex*
     - dts/riscv/riscv32-litex-vexriscv.dtsi
     - include/zephyr/drivers/*/*litex*
-    - samples/boards/litex/
+    - samples/boards/enjoydigital/litex/
     - samples/drivers/*litex/
     - soc/litex/
   labels:

diff --git a/boards/nxp/s32z2xxdc2/doc/index.rst b/boards/nxp/s32z2xxdc2/doc/index.rst
@@ -132,7 +132,7 @@ Ethernet
 
 NETC driver supports to manage the Physical Station Interface (PSI0) and/or a
 single Virtual SI (VSI). The rest of the VSI's shall be assigned to different
-cores of the system. Refer to :ref:`nxp_s32_netc-samples` to learn how to
+cores of the system. Refer to :zephyr:code-sample:`nxp_s32_netc` to learn how to
 configure the Ethernet network controller.
 
 Controller Area Network

diff --git a/boards/quicklogic/qomu/doc/index.rst b/boards/quicklogic/qomu/doc/index.rst
@@ -41,7 +41,7 @@ Below are steps to run Qomu sample application:
 #. Build the sample in an usual way:
 
    .. zephyr-app-commands::
-      :zephyr-app: samples/boards/qomu
+      :zephyr-app: samples/boards/quicklogic/qomu
       :board: qomu
       :goals: build
 

diff --git a/boards/st/sensortile_box/doc/index.rst b/boards/st/sensortile_box/doc/index.rst
@@ -185,7 +185,7 @@ You should see following confirmation on your Linux host:
    usb 2-2: SerialNumber: 204A325D574D
 
 You can build and flash the provided sample application
-(:ref:`sensortile_box sensors`) that reads sensors data and outputs
+(:zephyr:code-sample:`sensortile_box_sensors`) that reads sensors data and outputs
 values on the console.
 
 References

diff --git a/boards/st/sensortile_box_pro/doc/index.rst b/boards/st/sensortile_box_pro/doc/index.rst
@@ -322,7 +322,7 @@ You should see following confirmation on your Linux host:
    usb 2-2: SerialNumber: 204A325D574D
 
 You can build and flash the provided sample application
-(:ref:`sensortile_box_pro_sample_sensors`) that reads sensors data and outputs
+(:zephyr:code-sample:`sensortile_box_pro_sensors`) that reads sensors data and outputs
 values on the console.
 
 References

diff --git a/boards/st/steval_stwinbx1/doc/index.rst b/boards/st/steval_stwinbx1/doc/index.rst
@@ -362,7 +362,7 @@ You should see the following confirmation on your Linux host:
    usb 3-1: SerialNumber: 207136863530
 
 You can build and flash the provided sample application
-(:ref:`steval_stwinbx1_sample_sensors`) that reads sensors data and outputs
+(:zephyr:code-sample:`stwinbx1_sensors`) that reads sensors data and outputs
 values on the console.
 
 .. _STEVAL-STWINBX1 Development kit website:

diff --git a/doc/_scripts/redirects.py b/doc/_scripts/redirects.py
@@ -218,6 +218,52 @@
     ('samples/bluetooth/public_broadcast_source/README', 'samples/bluetooth/pbp_public_broadcast_source/README'),
     ('samples/bluetooth/unicast_audio_client/README', 'samples/bluetooth/bap_unicast_client/README'),
     ('samples/bluetooth/unicast_audio_server/README', 'samples/bluetooth/bap_unicast_server/README'),
+    ('samples/boards/96b_argonkey/microphone/README', 'samples/boards/96boards/argonkey/microphone/README'),
+    ('samples/boards/96b_argonkey/sensors/README', 'samples/boards/96boards/argonkey/sensors/README'),
+    ('samples/boards/esp32/deep_sleep/README', 'samples/boards/espressif/deep_sleep/README'),
+    ('samples/boards/esp32/flash_encryption/README', 'samples/boards/espressif/flash_encryption/README'),
+    ('samples/boards/esp32/flash_memory_mapped/README', 'samples/boards/espressif/flash_memory_mapped/README'),
+    ('samples/boards/esp32/light_sleep/README', 'samples/boards/espressif/light_sleep/README'),
+    ('samples/boards/esp32/spiram_test/README', 'samples/boards/espressif/spiram_test/README'),
+    ('samples/boards/esp32/wifi_apsta_mode/README', 'samples/boards/espressif/wifi_apsta_mode/README'),
+    ('samples/boards/esp32/xt_wdt/README', 'samples/boards/espressif/xt_wdt/README'),
+    ('samples/boards/google_twinkie_v2_pda/README', 'samples/boards/google/twinkie_v2/pda/README'),
+    ('samples/boards/intel_adsp/code_relocation/README', 'samples/boards/intel/adsp/code_relocation/README'),
+    ('samples/boards/litex/i2s/README', 'samples/boards/enjoydigital/litex/i2s/README'),
+    ('samples/boards/mec15xxevb_assy6853/power_management/README', 'samples/boards/microchip/mec15xxevb_assy6853/power_management/README'),
+    ('samples/boards/mimxrt1060_evk/system_off/README', 'samples/boards/nxp/mimxrt1060_evk/system_off/README'),
+    ('samples/boards/mimxrt1170_evk_cm7/magic_addr/README', 'samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/README'),
+    ('samples/boards/mimxrt595_evk/system_off/README', 'samples/boards/nxp/mimxrt595_evk/system_off/README'),
+    ('samples/boards/nrf/battery/README', 'samples/boards/nordic/battery/README'),
+    ('samples/boards/nrf/clock_skew/README', 'samples/boards/nordic/clock_skew/README'),
+    ('samples/boards/nrf/dynamic_pinctrl/README', 'samples/boards/nordic/dynamic_pinctrl/README'),
+    ('samples/boards/nrf/ieee802154/802154_rpmsg/README', 'samples/boards/nordic/ieee802154/802154_rpmsg/README'),
+    ('samples/boards/nrf/mesh/onoff-app/README', 'samples/boards/nordic/mesh/onoff-app/README'),
+    ('samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/README', 'samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/README'),
+    ('samples/boards/nrf/nrf53_sync_rtc/README', 'samples/boards/nordic/nrf53_sync_rtc/README'),
+    ('samples/boards/nrf/nrf_led_matrix/README', 'samples/boards/nordic/nrf_led_matrix/README'),
+    ('samples/boards/nrf/nrfx/README', 'samples/boards/nordic/nrfx/README'),
+    ('samples/boards/nrf/nrfx_prs/README', 'samples/boards/nordic/nrfx_prs/README'),
+    ('samples/boards/nrf/system_off/README', 'samples/boards/nordic/system_off/README'),
+    ('samples/boards/nxp_s32/netc/README', 'samples/boards/nxp/s32/netc/README'),
+    ('samples/boards/qomu/README', 'samples/boards/quicklogic/qomu/README'),
+    ('samples/boards/stm32/backup_sram/README', 'samples/boards/st/backup_sram/README'),
+    ('samples/boards/stm32/bluetooth/interactive_gui/README', 'samples/boards/st/bluetooth/interactive_gui/README'),
+    ('samples/boards/stm32/ccm/README', 'samples/boards/st/ccm/README'),
+    ('samples/boards/stm32/h7_dual_core/README', 'samples/boards/st/h7_dual_core/README'),
+    ('samples/boards/stm32/i2c_timing/README', 'samples/boards/st/i2c_timing/README'),
+    ('samples/boards/stm32/mco/README', 'samples/boards/st/mco/README'),
+    ('samples/boards/stm32/power_mgmt/adc/README', 'samples/boards/st/power_mgmt/adc/README'),
+    ('samples/boards/stm32/power_mgmt/blinky/README', 'samples/boards/st/power_mgmt/blinky/README'),
+    ('samples/boards/stm32/power_mgmt/serial_wakeup/README', 'samples/boards/st/power_mgmt/serial_wakeup/README'),
+    ('samples/boards/stm32/power_mgmt/standby_shutdown/README', 'samples/boards/st/power_mgmt/standby_shutdown/README'),
+    ('samples/boards/stm32/power_mgmt/stm32wb_ble/README', 'samples/boards/st/power_mgmt/stm32wb_ble/README'),
+    ('samples/boards/stm32/power_mgmt/stop3/README', 'samples/boards/st/power_mgmt/stop3/README'),
+    ('samples/boards/stm32/power_mgmt/suspend_to_ram/README', 'samples/boards/st/power_mgmt/suspend_to_ram/README'),
+    ('samples/boards/stm32/power_mgmt/wkup_pins/README', 'samples/boards/st/power_mgmt/wkup_pins/README'),
+    ('samples/boards/stm32/sensortile_box/README', 'samples/boards/st/sensortile_box/README'),
+    ('samples/boards/stm32/sensortile_box_pro/sensors-on-board/README', 'samples/boards/st/sensortile_box_pro/sensors-on-board/README'),
+    ('samples/boards/stm32/steval_stwinbx1/sensors/README', 'samples/boards/st/steval_stwinbx1/sensors/README'),
     ('samples/drivers/adc/README', 'samples/drivers/adc/adc_dt/README'),
     ('samples/drivers/kscan_touch', 'samples/subsys/input/input'),
     ('samples/drivers/led_apa102/README', 'samples/drivers/led_strip/README'),

diff --git a/doc/services/pm/system.rst b/doc/services/pm/system.rst
@@ -138,8 +138,8 @@ Examples
 
 Some helpful examples showing different power management features:
 
-* :zephyr_file:`samples/boards/stm32/power_mgmt/blinky/`
-* :zephyr_file:`samples/boards/esp32/deep_sleep/`
+* :zephyr_file:`samples/boards/st/power_mgmt/blinky/`
+* :zephyr_file:`samples/boards/espressif/deep_sleep/`
 * :zephyr_file:`samples/subsys/pm/device_pm/`
 * :zephyr_file:`tests/subsys/pm/power_mgmt/`
 * :zephyr_file:`tests/subsys/pm/power_mgmt_soc/`

diff --git a/samples/boards/96boards/argonkey/index.rst b/samples/boards/96boards/argonkey/index.rst
@@ -0,0 +1,10 @@
+.. _argonkey-samples:
+
+Argonkey Samples
+################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   */*
diff --git a/...ds/96b_argonkey/microphone/CMakeLists.txt → ...boards/argonkey/microphone/CMakeLists.txt b/...ds/96b_argonkey/microphone/CMakeLists.txt → ...boards/argonkey/microphone/CMakeLists.txt
diff --git a/...boards/96b_argonkey/microphone/README.rst → ...s/96boards/argonkey/microphone/README.rst b/...boards/96b_argonkey/microphone/README.rst → ...s/96boards/argonkey/microphone/README.rst
@@ -1,7 +1,8 @@
-.. _ArgonKey_Microphone:
+.. zephyr:code-sample:: argonkey_microphone
+   :name: Microphone
+   :relevant-api: audio_interface
 
-ArgonKey Board Microphone
-#########################
+   Acquire audio through the ArgonKey's on-board MP34DT05 microphone.
 
 Overview
 ********
@@ -31,7 +32,7 @@ Building and Running
 ********************
 
 .. zephyr-app-commands::
-    :zephyr-app: samples/boards/96b_argonkey/microphone
+    :zephyr-app: samples/boards/96boards/argonkey/microphone
     :host-os: unix
     :board: 96b_argonkey
     :goals: run

diff --git a/...s/boards/96b_argonkey/microphone/prj.conf → ...rds/96boards/argonkey/microphone/prj.conf b/...s/boards/96b_argonkey/microphone/prj.conf → ...rds/96boards/argonkey/microphone/prj.conf
diff --git a/...oards/96b_argonkey/microphone/sample.yaml → .../96boards/argonkey/microphone/sample.yaml b/...oards/96b_argonkey/microphone/sample.yaml → .../96boards/argonkey/microphone/sample.yaml
diff --git a/...boards/96b_argonkey/microphone/src/main.c → ...s/96boards/argonkey/microphone/src/main.c b/...boards/96b_argonkey/microphone/src/main.c → ...s/96boards/argonkey/microphone/src/main.c
diff --git a/...oards/96b_argonkey/sensors/CMakeLists.txt → .../96boards/argonkey/sensors/CMakeLists.txt b/...oards/96b_argonkey/sensors/CMakeLists.txt → .../96boards/argonkey/sensors/CMakeLists.txt
diff --git a/...es/boards/96b_argonkey/sensors/README.rst → ...ards/96boards/argonkey/sensors/README.rst b/...es/boards/96b_argonkey/sensors/README.rst → ...ards/96boards/argonkey/sensors/README.rst
@@ -1,7 +1,7 @@
-.. _ArgonKey_Sensors:
+.. zephyr:code-sample:: argonkey_sensors
+   :name: Sensors
 
-ArgonKey Board Sensors
-######################
+   Read sensor data from the ArgonKey board's onboard sensors.
 
 Overview
 ********
@@ -46,7 +46,7 @@ Building and Running
 ********************
 
 .. zephyr-app-commands::
-    :zephyr-app: samples/boards/96b_argonkey/sensors
+    :zephyr-app: samples/boards/96boards/argonkey/sensors
     :host-os: unix
     :board: 96b_argonkey
     :goals: run

diff --git a/samples/boards/96b_argonkey/sensors/prj.conf → ...boards/96boards/argonkey/sensors/prj.conf b/samples/boards/96b_argonkey/sensors/prj.conf → ...boards/96boards/argonkey/sensors/prj.conf
diff --git a/...s/boards/96b_argonkey/sensors/sample.yaml → ...rds/96boards/argonkey/sensors/sample.yaml b/...s/boards/96b_argonkey/sensors/sample.yaml → ...rds/96boards/argonkey/sensors/sample.yaml
diff --git a/...es/boards/96b_argonkey/sensors/src/main.c → ...ards/96boards/argonkey/sensors/src/main.c b/...es/boards/96b_argonkey/sensors/src/main.c → ...ards/96boards/argonkey/sensors/src/main.c
diff --git a/samples/boards/96boards/index.rst b/samples/boards/96boards/index.rst
@@ -0,0 +1,10 @@
+.. _96boards_samples:
+
+96Boards
+========
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   */*
diff --git a/samples/boards/bbc/index.rst b/samples/boards/bbc/index.rst
@@ -0,0 +1,11 @@
+.. _bbc_samples:
+
+BBC
+===
+
+.. toctree::
+   :titlesonly:
+   :maxdepth: 1
+   :glob:
+
+   */*
diff --git a/...oards/bbc_microbit/display/CMakeLists.txt → ...oards/bbc/microbit/display/CMakeLists.txt b/...oards/bbc_microbit/display/CMakeLists.txt → ...oards/bbc/microbit/display/CMakeLists.txt
diff --git a/...es/boards/bbc_microbit/display/README.rst → ...es/boards/bbc/microbit/display/README.rst b/...es/boards/bbc_microbit/display/README.rst → ...es/boards/bbc/microbit/display/README.rst
@@ -1,7 +1,7 @@
-.. _microbit_display:
+.. zephyr:code-sample:: bbc_microbit_display
+   :name: LED matrix display
 
-BBC micro:bit display
-#####################
+   Use the 5x5 LED matrix display on the BBC micro:bit board.
 
 Overview
 ********
@@ -15,7 +15,7 @@ This project outputs various things on the BBC micro:bit display. It can
 be built as follows:
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/boards/bbc_microbit/display
+   :zephyr-app: samples/boards/bbc/microbit/display
    :board: bbc_microbit
    :goals: build
    :compact:

diff --git a/samples/boards/bbc_microbit/display/prj.conf → samples/boards/bbc/microbit/display/prj.conf b/samples/boards/bbc_microbit/display/prj.conf → samples/boards/bbc/microbit/display/prj.conf
diff --git a/...s/boards/bbc_microbit/display/sample.yaml → ...s/boards/bbc/microbit/display/sample.yaml b/...s/boards/bbc_microbit/display/sample.yaml → ...s/boards/bbc/microbit/display/sample.yaml
diff --git a/...es/boards/bbc_microbit/display/src/main.c → ...es/boards/bbc/microbit/display/src/main.c b/...es/boards/bbc_microbit/display/src/main.c → ...es/boards/bbc/microbit/display/src/main.c
diff --git a/...crobit/line_follower_robot/CMakeLists.txt → ...crobit/line_follower_robot/CMakeLists.txt b/...crobit/line_follower_robot/CMakeLists.txt → ...crobit/line_follower_robot/CMakeLists.txt
diff --git a/...c_microbit/line_follower_robot/README.rst → ...c/microbit/line_follower_robot/README.rst b/...c_microbit/line_follower_robot/README.rst → ...c/microbit/line_follower_robot/README.rst
@@ -1,7 +1,7 @@
-.. _microbit_line_follower_robot:
+.. zephyr:code-sample:: bbc_microbit_line_follower_robot
+   :name: Line following robot
 
-BBC micro:bit line-follower robot
-#################################
+   Implement a line following robot using a BBC micro:bit board and robot chassis.
 
 Overview
 ********
@@ -25,7 +25,7 @@ Building and running
 Build and flash this sample project using these commands:
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/boards/bbc_microbit/line_follower_robot
+   :zephyr-app: samples/boards/bbc/microbit/line_follower_robot
    :board: bbc_microbit
    :goals: build flash
    :compact:

diff --git a/...ollower_robot/boards/bbc_microbit.overlay → ...ollower_robot/boards/bbc_microbit.overlay b/...ollower_robot/boards/bbc_microbit.overlay → ...ollower_robot/boards/bbc_microbit.overlay
diff --git a/..._robot/dts/bindings/motor-controller.yaml → ..._robot/dts/bindings/motor-controller.yaml b/..._robot/dts/bindings/motor-controller.yaml → ..._robot/dts/bindings/motor-controller.yaml
diff --git a/...bbc_microbit/line_follower_robot/prj.conf → ...bbc/microbit/line_follower_robot/prj.conf b/...bbc_microbit/line_follower_robot/prj.conf → ...bbc/microbit/line_follower_robot/prj.conf
diff --git a/..._microbit/line_follower_robot/sample.yaml → .../microbit/line_follower_robot/sample.yaml b/..._microbit/line_follower_robot/sample.yaml → .../microbit/line_follower_robot/sample.yaml
diff --git a/...c_microbit/line_follower_robot/src/main.c → ...c/microbit/line_follower_robot/src/main.c b/...c_microbit/line_follower_robot/src/main.c → ...c/microbit/line_follower_robot/src/main.c
diff --git a/samples/boards/bbc_microbit/microbit.rst → samples/boards/bbc/microbit/microbit.rst b/samples/boards/bbc_microbit/microbit.rst → samples/boards/bbc/microbit/microbit.rst
diff --git a/...s/boards/bbc_microbit/pong/CMakeLists.txt → ...s/boards/bbc/microbit/pong/CMakeLists.txt b/...s/boards/bbc_microbit/pong/CMakeLists.txt → ...s/boards/bbc/microbit/pong/CMakeLists.txt
diff --git a/samples/boards/bbc_microbit/pong/README.rst → samples/boards/bbc/microbit/pong/README.rst b/samples/boards/bbc_microbit/pong/README.rst → samples/boards/bbc/microbit/pong/README.rst
@@ -1,12 +1,12 @@
-.. _microbit_pong:
+.. zephyr:code-sample:: bbc_microbit_pong
+   :name: Pong game
 
-BBC micro:bit pong game
-#######################
+   Play pong as single player or over Bluetooth between two micro:bit devices.
 
 Overview
 ********
 
-Play pong over as single player or Bluetooth between two micro:bit
+Play pong as single player or over Bluetooth between two micro:bit
 devices.
 
 The game works by controlling a paddle with the two buttons of the
@@ -26,7 +26,7 @@ Building and running
 ********************
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/boards/bbc_microbit/pong
+   :zephyr-app: samples/boards/bbc/microbit/pong
    :board: bbc_microbit
    :goals: build flash
    :compact:
diff --git a/...microbit/pong/boards/bbc_microbit.overlay → ...microbit/pong/boards/bbc_microbit.overlay b/...microbit/pong/boards/bbc_microbit.overlay → ...microbit/pong/boards/bbc_microbit.overlay
diff --git a/samples/boards/bbc_microbit/pong/prj.conf → samples/boards/bbc/microbit/pong/prj.conf b/samples/boards/bbc_microbit/pong/prj.conf → samples/boards/bbc/microbit/pong/prj.conf
diff --git a/samples/boards/bbc_microbit/pong/sample.yaml → samples/boards/bbc/microbit/pong/sample.yaml b/samples/boards/bbc_microbit/pong/sample.yaml → samples/boards/bbc/microbit/pong/sample.yaml
diff --git a/samples/boards/bbc_microbit/pong/src/ble.c → samples/boards/bbc/microbit/pong/src/ble.c b/samples/boards/bbc_microbit/pong/src/ble.c → samples/boards/bbc/microbit/pong/src/ble.c
diff --git a/samples/boards/bbc_microbit/pong/src/main.c → samples/boards/bbc/microbit/pong/src/main.c b/samples/boards/bbc_microbit/pong/src/main.c → samples/boards/bbc/microbit/pong/src/main.c
diff --git a/samples/boards/bbc_microbit/pong/src/pong.h → samples/boards/bbc/microbit/pong/src/pong.h b/samples/boards/bbc_microbit/pong/src/pong.h → samples/boards/bbc/microbit/pong/src/pong.h
diff --git a/.../boards/bbc_microbit/sound/CMakeLists.txt → .../boards/bbc/microbit/sound/CMakeLists.txt b/.../boards/bbc_microbit/sound/CMakeLists.txt → .../boards/bbc/microbit/sound/CMakeLists.txt
diff --git a/samples/boards/bbc_microbit/sound/README.rst → samples/boards/bbc/microbit/sound/README.rst b/samples/boards/bbc_microbit/sound/README.rst → samples/boards/bbc/microbit/sound/README.rst
@@ -1,7 +1,8 @@
-.. _microbit_sound:
+.. zephyr:code-sample:: bbc_microbit_sound
+   :name: Sound
+   :relevant-api: pwm_interface
 
-BBC micro:bit sound
-###################
+   Use the piezo buzzer on the BBC micro:bit board.
 
 Overview
 ********
@@ -30,7 +31,7 @@ Building for a BBC micro:bit v1
 -------------------------------
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/boards/bbc_microbit/sound
+   :zephyr-app: samples/boards/bbc/microbit/sound
    :board: bbc_microbit
    :goals: build flash
    :compact:
@@ -39,7 +40,7 @@ Building for a BBC micro:bit v2
 -------------------------------
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/boards/bbc_microbit/sound
+   :zephyr-app: samples/boards/bbc/microbit/sound
    :board: bbc_microbit_v2
    :goals: build flash
    :compact:

diff --git a/...icrobit/sound/boards/bbc_microbit.overlay → ...icrobit/sound/boards/bbc_microbit.overlay b/...icrobit/sound/boards/bbc_microbit.overlay → ...icrobit/sound/boards/bbc_microbit.overlay
diff --git a/...obit/sound/boards/bbc_microbit_v2.overlay → ...obit/sound/boards/bbc_microbit_v2.overlay b/...obit/sound/boards/bbc_microbit_v2.overlay → ...obit/sound/boards/bbc_microbit_v2.overlay
diff --git a/samples/boards/bbc_microbit/sound/prj.conf → samples/boards/bbc/microbit/sound/prj.conf b/samples/boards/bbc_microbit/sound/prj.conf → samples/boards/bbc/microbit/sound/prj.conf
diff --git a/...les/boards/bbc_microbit/sound/sample.yaml → ...les/boards/bbc/microbit/sound/sample.yaml b/...les/boards/bbc_microbit/sound/sample.yaml → ...les/boards/bbc/microbit/sound/sample.yaml
diff --git a/samples/boards/bbc_microbit/sound/src/main.c → samples/boards/bbc/microbit/sound/src/main.c b/samples/boards/bbc_microbit/sound/src/main.c → samples/boards/bbc/microbit/sound/src/main.c
diff --git a/samples/boards/boards.rst b/samples/boards/boards.rst
@@ -4,7 +4,8 @@ Board-specific samples
 ######################
 
 .. toctree::
-   :maxdepth: 1
+   :titlesonly:
+   :maxdepth: 2
    :glob:
 
-   **/*
+   */*
diff --git a/samples/boards/enjoydigital/index.rst b/samples/boards/enjoydigital/index.rst
@@ -0,0 +1,10 @@
+.. _enjoydigital_samples:
+
+EnjoyDigital
+============
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   **/*
diff --git a/samples/boards/litex/i2s/CMakeLists.txt → ...rds/enjoydigital/litex/i2s/CMakeLists.txt b/samples/boards/litex/i2s/CMakeLists.txt → ...rds/enjoydigital/litex/i2s/CMakeLists.txt
diff --git a/samples/boards/litex/i2s/README.rst → .../boards/enjoydigital/litex/i2s/README.rst b/samples/boards/litex/i2s/README.rst → .../boards/enjoydigital/litex/i2s/README.rst
diff --git a/samples/boards/litex/i2s/prj.conf → ...es/boards/enjoydigital/litex/i2s/prj.conf b/samples/boards/litex/i2s/prj.conf → ...es/boards/enjoydigital/litex/i2s/prj.conf
diff --git a/samples/boards/litex/i2s/sample.yaml → ...boards/enjoydigital/litex/i2s/sample.yaml b/samples/boards/litex/i2s/sample.yaml → ...boards/enjoydigital/litex/i2s/sample.yaml
diff --git a/samples/boards/litex/i2s/src/main.c → .../boards/enjoydigital/litex/i2s/src/main.c b/samples/boards/litex/i2s/src/main.c → .../boards/enjoydigital/litex/i2s/src/main.c
diff --git a/...es/boards/esp32/deep_sleep/CMakeLists.txt → ...oards/espressif/deep_sleep/CMakeLists.txt b/...es/boards/esp32/deep_sleep/CMakeLists.txt → ...oards/espressif/deep_sleep/CMakeLists.txt
diff --git a/samples/boards/esp32/deep_sleep/Kconfig → samples/boards/espressif/deep_sleep/Kconfig b/samples/boards/esp32/deep_sleep/Kconfig → samples/boards/espressif/deep_sleep/Kconfig
diff --git a/samples/boards/esp32/deep_sleep/README.rst → ...es/boards/espressif/deep_sleep/README.rst b/samples/boards/esp32/deep_sleep/README.rst → ...es/boards/espressif/deep_sleep/README.rst
@@ -1,7 +1,7 @@
-.. _esp32-deep-sleep-sample:
+.. zephyr:code-sample:: esp32-deep-sleep
+   :name: Deep Sleep
 
-ESP32 Deep Sleep demo
-#####################
+   Use deep sleep with wake on timer, GPIO, and EXT1 sources on ESP32.
 
 Overview
 ********
@@ -50,7 +50,7 @@ Building, Flashing and Running
 ******************************
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/boards/esp32/deep_sleep
+   :zephyr-app: samples/boards/espressif/deep_sleep
    :board: esp32_devkitc_wroom/esp32/procpu
    :goals: build flash
    :compact:

diff --git a/...ep/boards/esp32_devkitc_wroom_procpu.conf → ...ep/boards/esp32_devkitc_wroom_procpu.conf b/...ep/boards/esp32_devkitc_wroom_procpu.conf → ...ep/boards/esp32_devkitc_wroom_procpu.conf
diff --git a/...32/deep_sleep/boards/esp32c6_devkitc.conf → ...if/deep_sleep/boards/esp32c6_devkitc.conf b/...32/deep_sleep/boards/esp32c6_devkitc.conf → ...if/deep_sleep/boards/esp32c6_devkitc.conf
diff --git a/...sp32/deep_sleep/boards/esp32s2_saola.conf → ...ssif/deep_sleep/boards/esp32s2_saola.conf b/...sp32/deep_sleep/boards/esp32s2_saola.conf → ...ssif/deep_sleep/boards/esp32s2_saola.conf
diff --git a/...32/deep_sleep/boards/yd_esp32_procpu.conf → ...if/deep_sleep/boards/yd_esp32_procpu.conf b/...32/deep_sleep/boards/yd_esp32_procpu.conf → ...if/deep_sleep/boards/yd_esp32_procpu.conf
diff --git a/samples/boards/esp32/deep_sleep/prj.conf → samples/boards/espressif/deep_sleep/prj.conf b/samples/boards/esp32/deep_sleep/prj.conf → samples/boards/espressif/deep_sleep/prj.conf
diff --git a/samples/boards/esp32/deep_sleep/sample.yaml → ...s/boards/espressif/deep_sleep/sample.yaml b/samples/boards/esp32/deep_sleep/sample.yaml → ...s/boards/espressif/deep_sleep/sample.yaml
diff --git a/...boards/esp32/deep_sleep/socs/esp32c3.conf → ...ds/espressif/deep_sleep/socs/esp32c3.conf b/...boards/esp32/deep_sleep/socs/esp32c3.conf → ...ds/espressif/deep_sleep/socs/esp32c3.conf
diff --git a/...rds/esp32/deep_sleep/socs/esp32c3.overlay → ...espressif/deep_sleep/socs/esp32c3.overlay b/...rds/esp32/deep_sleep/socs/esp32c3.overlay → ...espressif/deep_sleep/socs/esp32c3.overlay
diff --git a/samples/boards/esp32/deep_sleep/src/main.c → ...es/boards/espressif/deep_sleep/src/main.c b/samples/boards/esp32/deep_sleep/src/main.c → ...es/boards/espressif/deep_sleep/src/main.c
diff --git a/samples/boards/esp32/ethernet/CMakeLists.txt → .../boards/espressif/ethernet/CMakeLists.txt b/samples/boards/esp32/ethernet/CMakeLists.txt → .../boards/espressif/ethernet/CMakeLists.txt
diff --git a/.../boards/esp32_ethernet_kit_procpu.overlay → .../boards/esp32_ethernet_kit_procpu.overlay b/.../boards/esp32_ethernet_kit_procpu.overlay → .../boards/esp32_ethernet_kit_procpu.overlay
diff --git a/samples/boards/esp32/ethernet/prj.conf → samples/boards/espressif/ethernet/prj.conf b/samples/boards/esp32/ethernet/prj.conf → samples/boards/espressif/ethernet/prj.conf
diff --git a/samples/boards/esp32/ethernet/sample.yaml → ...les/boards/espressif/ethernet/sample.yaml b/samples/boards/esp32/ethernet/sample.yaml → ...les/boards/espressif/ethernet/sample.yaml
diff --git a/samples/boards/esp32/ethernet/src/main.c → samples/boards/espressif/ethernet/src/main.c b/samples/boards/esp32/ethernet/src/main.c → samples/boards/espressif/ethernet/src/main.c
diff --git a/...rds/esp32/flash_encryption/CMakeLists.txt → ...espressif/flash_encryption/CMakeLists.txt b/...rds/esp32/flash_encryption/CMakeLists.txt → ...espressif/flash_encryption/CMakeLists.txt