merge: 'upstream' into pst-v4.3.99 zephyrproject-rtos#22

# Conflicts:
#	drivers/ethernet/eth_stm32_hal_common.c
#	subsys/shell/backends/shell_uart.c
#	subsys/shell/modules/devmem_service.c

Author: ndrs-pst

.github/workflows/assigner.yml

@@ -9,6 +9,8 @@ on:
     - ready_for_review
     branches:
     - main
+    - collab-*
+    - v*-branch
   issues:
     types:
     - labeled
@@ -38,7 +40,7 @@ jobs:
 
     - name: Fetch west.yml/Maintainer.yml from pull request
       if: >
-        github.event_name == 'pull_request_target'
+        github.event_name == 'pull_request_target' && github.base_ref == 'main'
       run: |
         git fetch origin pull/${{ github.event.pull_request.number }}/merge
         git show FETCH_HEAD:west.yml > pr_west.yml
@@ -61,7 +63,11 @@ jobs:
         FLAGS+=" -r ${{ github.event.repository.name }}"
         FLAGS+=" -M MAINTAINERS.yml"
         if [ "${{ github.event_name }}" = "pull_request_target" ]; then
-          FLAGS+=" -P ${{ github.event.pull_request.number }} --updated-manifest pr_west.yml --updated-maintainer-file pr_MAINTAINERS.yml"
+          if [ "${{ github.base_ref }}" != "main" ]; then
+            FLAGS+=" -P ${{ github.event.pull_request.number }} --updated-manifest pr_west.yml --updated-maintainer-file pr_MAINTAINERS.yml"
+          else
+            FLAGS+=" -P ${{ github.event.pull_request.number }}"
+          fi
         elif [ "${{ github.event_name }}" = "issues" ]; then
           FLAGS+=" -I ${{ github.event.issue.number }}"
         elif [ "${{ github.event_name }}" = "schedule" ]; then
@@ -74,7 +80,7 @@ jobs:
 
     - name: Check maintainer file changes
       if: >
-        github.event_name == 'pull_request_target'
+        github.event_name == 'pull_request_target' && github.base_ref == 'main'
       env:
         GITHUB_TOKEN: ${{ secrets.ZB_PR_ASSIGNER_GITHUB_TOKEN }}
       run: |

MAINTAINERS.yml

@@ -2450,7 +2450,7 @@ Documentation Infrastructure:
     - include/zephyr/drivers/stepper/
     - include/zephyr/drivers/stepper.h
     - dts/bindings/stepper/
-    - doc/hardware/peripherals/stepper.rst
+    - doc/hardware/peripherals/stepper/
     - samples/drivers/stepper/
     - tests/drivers/build_all/stepper/
     - tests/drivers/stepper/
@@ -3386,6 +3386,7 @@ Microchip RISC-V Platforms:
   status: maintained
   maintainers:
     - fkokosinski
+  collaborators:
     - kgugala
     - tgorochowik
   files:

boards/nxp/frdm_mcxn947/CMakeLists.txt

@@ -9,7 +9,6 @@ zephyr_library_sources(board.c)
 
 if(CONFIG_FLEXSPI_CONFIG_BLOCK_OFFSET)
   # Include flash configuration block
-  zephyr_compile_definitions(XIP_BOOT_HEADER_ENABLE=1)
   zephyr_library_sources(xip/mcxn_flexspi_nor_config.c)
   zephyr_library_include_directories(xip)
 endif()

boards/nxp/frdm_rw612/CMakeLists.txt

@@ -10,7 +10,6 @@ dt_nodelabel(xtal32 NODELABEL "xtal32")
 dt_node_has_status(xtal32_status PATH ${xtal32} STATUS okay)
 
 if(CONFIG_NXP_RW6XX_BOOT_HEADER)
-  zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
   # This FCB is specific to the flash on this board, it won't work
   # for boards with different flash chips. If you flash this FCB
   # onto a board with a different flash chip you may break it.

boards/nxp/mcx_nx4x_evk/CMakeLists.txt

@@ -9,7 +9,6 @@ zephyr_library_sources(board.c)
 
 if(CONFIG_FLEXSPI_CONFIG_BLOCK_OFFSET)
   # Include flash configuration block
-  zephyr_compile_definitions(XIP_BOOT_HEADER_ENABLE=1)
   zephyr_library_sources(xip/mcxn_flexspi_nor_config.c)
   zephyr_library_include_directories(xip)
 endif()

boards/nxp/rd_rw612_bga/CMakeLists.txt

@@ -16,7 +16,6 @@ if(CONFIG_NXP_RW6XX_BOOT_HEADER)
      "update your flash configuration block data")
   endif()
   zephyr_compile_definitions(BOOT_HEADER_ENABLE=1)
-  zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
   zephyr_library_sources(MX25U51245GZ4I00_FCB.c)
 endif()
 

boards/st/stm32n6570_dk/twister.yaml

@@ -1,7 +1,7 @@
 name: STM32N6570 Discovery Kit
 type: mcu
 arch: arm
-ram: 128
+ram: 192
 flash: 512
 vendor: st
 supported:

doc/connectivity/networking/dsa.rst

@@ -83,7 +83,7 @@ of i.MX NETC.
                    .phy_mode = NETC_PHY_MODE(port),                                            \
            };                                                                                  \
            struct dsa_port_config dsa_##n##_##port##_config = {                                \
-                   .use_random_mac_addr = DT_NODE_HAS_PROP(port, zephyr_random_mac_address),   \
+                   .use_random_mac_addr = DT_PROP(port, zephyr_random_mac_address),            \
                    .mac_addr = DT_PROP_OR(port, local_mac_address, {0}),                       \
                    .port_idx = DT_REG_ADDR(port),                                              \
                    .phy_dev = DEVICE_DT_GET_OR_NULL(DT_PHANDLE(port, phy_handle)),             \

doc/hardware/peripherals/index.rst

@@ -58,7 +58,7 @@ Peripherals
    sensor/index.rst
    sent.rst
    spi.rst
-   stepper.rst
+   stepper/index.rst
    smbus.rst
    uart.rst
    usbc_vbus.rst

doc/hardware/peripherals/stepper.rst …c/hardware/peripherals/stepper/index.rstdoc/hardware/peripherals/stepper.rst renamed to doc/hardware/peripherals/stepper/index.rst doc/hardware/peripherals/stepper.rst renamed to doc/hardware/peripherals/stepper/index.rst

@@ -3,22 +3,27 @@
 Steppers
 ########
 
-The stepper driver API provides a set of functions for controlling and configuring stepper drivers.
+The stepper driver subsystem consists of two device driver APIs:
 
-Configure Stepper Driver
-========================
+Stepper-DRV API
+***************
+
+The stepper driver API provides a common interface for stepper drivers.
+
+- Configure **micro-stepping resolution** using :c:func:`stepper_drv_set_micro_step_res`
+  and :c:func:`stepper_drv_get_micro_step_res`.
+- **Enable** the stepper driver using :c:func:`stepper_drv_enable`.
+- **Disable** the stepper driver using :c:func:`stepper_drv_disable`.
+- Register an **event callback** using :c:func:`stepper_drv_set_event_cb`.
+
+Stepper API
+***********
+
+The stepper API provides a common interface for stepper controllers.
 
-- Configure **micro-stepping resolution** using :c:func:`stepper_set_micro_step_res`
-  and :c:func:`stepper_get_micro_step_res`.
 - Configure **reference position** in microsteps using :c:func:`stepper_set_reference_position`
   and :c:func:`stepper_get_actual_position`.
 - Set **step interval** in nanoseconds between steps using :c:func:`stepper_set_microstep_interval`
-- **Enable** the stepper driver using :c:func:`stepper_enable`.
-- **Disable** the stepper driver using :c:func:`stepper_disable`.
-
-Control Stepper
-===============
-
 - **Move by** +/- micro-steps also known as **relative movement** using :c:func:`stepper_move_by`.
 - **Move to** a specific position also known as **absolute movement** using :c:func:`stepper_move_to`.
 - Run continuously with a **constant step interval** in a specific direction until
@@ -27,30 +32,30 @@ Control Stepper
 - Check if the stepper is **moving** using :c:func:`stepper_is_moving`.
 - Register an **event callback** using :c:func:`stepper_set_event_callback`.
 
+.. _stepper-device-tree:
+
 Device Tree
-===========
+***********
 
 In the context of stepper controllers  device tree provides the initial hardware
 configuration for stepper drivers on a per device level. Each device must specify
 a device tree binding in Zephyr, and ideally, a set of hardware configuration options
 for things such as current settings, ramp parameters and furthermore. These can then
 be used in a boards devicetree to configure a stepper driver to its initial state.
 
-See examples in:
+Driver Composition Scenarios
+============================
 
-- :dtcompatible:`zephyr,h-bridge-stepper`
-- :dtcompatible:`adi,tmc50xx`
+Below are two typical scenarios:
 
-Discord
-=======
+.. toctree::
+   :maxdepth: 1
 
-Zephyr has a `stepper discord`_ channel for stepper related discussions, which
-is open to all.
-
-.. _stepper-api-reference:
+   integrated_controller_driver.rst
+   individual_controller_driver.rst
 
 Stepper API Test Suite
-======================
+**********************
 
 The stepper API test suite provides a set of tests that can be used to verify the functionality of
 stepper drivers.
@@ -91,8 +96,16 @@ have been skipped.
 API Reference
 *************
 
+.. _stepper-drv-api-reference:
+
 A common set of functions which should be implemented by all stepper drivers.
 
+.. doxygengroup:: stepper_drv_interface
+
+.. _stepper-api-reference:
+
+A common set of functions which should be implemented by all stepper controllers.
+
 .. doxygengroup:: stepper_interface
 
 Stepper controller specific APIs